Merge remote-tracking branch 'origin/release/2.7.0' into develop

2024-09-18 23:25:39 +00:00 · 2022-03-20 15:43:08 -04:00 · 2022-03-20 15:43:08 -04:00 · 17aefc3cf7
commit 17aefc3cf7
parent e488452ef3 cf5429a39b
155 changed files with 173476 additions and 35019 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,95 @@
 # 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
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -33,6 +33,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
 # Support Visual Studio Code
 include(CMakeToolsHelpers OPTIONAL)
 include(FeatureSummary)
+include(KPXCHelpers)

 include(CheckCCompilerFlag)
 include(CheckCXXCompilerFlag)
@ -493,6 +494,10 @@ if(BOTAN2_VERSION VERSION_LESS "2.11.0")
    message(FATAL_ERROR "Botan2 2.11.0 or higher is required")
 endif()
 include_directories(SYSTEM ${BOTAN2_INCLUDE_DIR})
+# Find Argon2 -- Botan 2.18 and below does not support threaded Argon2
+find_library(ARGON2_LIBRARIES NAMES argon2)
+find_path(ARGON2_INCLUDE_DIR NAMES argon2.h PATH_SUFFIXES local/include)
+include_directories(SYSTEM ${ARGON2_INCLUDE_DIR})

 # Find zlib
 find_package(ZLIB REQUIRED)
--- a/2
+++ b/2
@ -175,14 +175,12 @@ Files: share/icons/application/scalable/actions/chevron-double-down.svg
       share/icons/application/scalable/actions/hammer-wrench.svg
       share/icons/application/scalable/actions/health.svg
       share/icons/application/scalable/actions/help-about.svg
-       share/icons/application/scalable/actions/key-enter.svg
       share/icons/application/scalable/actions/lock-question.svg
       share/icons/application/scalable/actions/message-close.svg
       share/icons/application/scalable/actions/move-down.svg
       share/icons/application/scalable/actions/move-up.svg
       share/icons/application/scalable/actions/paperclip.svg
       share/icons/application/scalable/actions/password-copy.svg
-       share/icons/application/scalable/actions/password-generate.svg
       share/icons/application/scalable/actions/password-generator.svg
       share/icons/application/scalable/actions/password-show-off.svg
       share/icons/application/scalable/actions/password-show-on.svg
--- a/INSTALL.md
+++ b/INSTALL.md
@ -14,18 +14,19 @@ The following tools must exist within your PATH:
 * make
 * cmake (>= 3.3.0)
 * g++ (>= 4.7) or clang++ (>= 6.0)
-* asciidoctor
+* asciidoctor (>= 2.0)

 The following libraries are required:

 * Qt 5 (>= 5.9.5): qtbase5, qtbase5-private, libqt5svg5, qttools5, qt5-image-formats-plugins
 * botan (>= 2.12)
+* libargon2
 * zlib
 * minizip
 * readline (for completion in cli)
-* libqt5x11extras5, libxi, and libxtst (for auto-type on X11)
+* qtx11extras, libxi, and libxtst (for auto-type on X11)
 * qrencode
-* libusb-1.0, pcsclite (optional to support YubiKey on Linux)
+* libusb-1.0, pcsc-lite (for Yubikey support on Linux)

 Prepare the Building Environment
 ================================
@ -38,110 +39,119 @@ 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 you can also use MSVC to build natively, we recommend Visual Studio 2019
+To compile from source, open a **Terminal (Linux/MacOS)**, the **MSVC Tools Command Prompt (Windows)**, or **MSYS2-MinGW shell (Windows)**. For code development on Windows, you can use Visual Studio 2022, Visual Studio Code, or CLion.

-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).
+1. 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).

-To clone the project from Git, `cd` to a suitable location and run
+   To clone the project from Git, `cd` to a suitable location and run

-```bash
-git clone https://github.com/keepassxreboot/keepassxc.git
-```
+   ```
+   git clone https://github.com/keepassxreboot/keepassxc.git
+   ```

-This will clone the entire contents of the repository and check out the current `develop` branch.
+   This will clone the entire contents of the repository and check out the current `develop` branch.

-To update the project from within the project's folder, you can run the following command:
+   To update the project from within the project's folder, you can run the following command:

-```bash
-git pull
-```
+   ```
+   git pull
+   ```

-For a stable build, it is recommended to checkout the master branch.
+   For a stable build, it is recommended to check out the master branch.

-```bash
-git checkout master
-```
+   ```
+   git checkout master
+   ```

-NOTE: See the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows) for building with MSVC.
+2. Navigate to the directory where you have downloaded KeePassXC and type these commands:

-Navigate to the directory where you have downloaded KeePassXC and type these commands:
+   ```
+   mkdir build
+   cd build
+   cmake -DWITH_XC_ALL=ON ..
+   make
+   ```
+
+Note: These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
+
+## MacOS Build Notes
+
+If you installed Qt5 via Homebrew, you should be able to compile KeePassXC without any changes. If CMake fails to find your Qt installation, you can specify it manually by adding the following parameter:
+
+`-DCMAKE_PREFIX_PATH=/usr/local/opt/qt/lib/cmake`
+
+(or whatever your Qt installation path is)
+
+When building with ASAN support on macOS, you need to use `export ASAN_OPTIONS=detect_leaks=0` before running the tests (LSAN is no supported on macOS).
+
+## Windows Build Notes
+
+For detailed build steps see the [Windows Build Instructions](https://github.com/keepassxreboot/keepassxc/wiki/Building-KeePassXC#windows).
+
+If you are using MSVC, you may have to specify your Vcpkg toolchain by adding the following CMake parameter: `-DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake`
+
+If you are using MSYS2, you have to add ```-G "MSYS Makefiles"``` at the beginning of the cmake command.
+
+CMake Configuration Options
+==========================
+
+## Common Parameters

 ```
-mkdir build
-cd build
-cmake -DWITH_XC_ALL=ON ..
-make
+-DCMAKE_INSTALL_PREFIX=/usr/local
+-DCMAKE_VERBOSE_MAKEFILE=ON
+-DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
+-DWITH_GUI_TESTS=ON
 ```

-NOTE: If you are using MSYS2, you may have to add ```-G "MSYS Makefiles"``` to the beginning of the cmake command.
+## KeePassXC Parameters

-These steps place the compiled KeePassXC binary inside the `./build/src/` directory.
-(Note the cmake notes/options below.)
+KeePassXC comes with a variety of build options that can turn on/off features. Most notably, we allow you to build the application with all TCP/IP networking code disabled. Please note that we still require and link against Qt5's network library in order to use local named pipes on all operating systems. Each of these build options are supplied at the time of calling cmake:

-**Cmake Notes:**
+```
+-DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
+-DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
+-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_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_ALL=[ON|OFF] Enable/Disable compiling all plugins above (default: OFF)

-* Common cmake parameters
+-DWITH_XC_UPDATECHECK=[ON|OFF] Enable/Disable automatic updating checking (requires WITH_XC_NETWORKING) (default: ON)

-	```
-	-DCMAKE_INSTALL_PREFIX=/usr/local
-	-DCMAKE_VERBOSE_MAKEFILE=ON
-	-DCMAKE_BUILD_TYPE=<RelWithDebInfo/Debug/Release>
-	-DWITH_GUI_TESTS=ON
-	```
+-DWITH_TESTS=[ON|OFF] Enable/Disable building of unit tests (default: ON)
+-DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
+-DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
+-DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux / macOS only) (default: OFF)
+-DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
+-DWITH_APP_BUNDLE=[ON|OFF] Enable Application Bundle for macOS (default: ON)

-* cmake accepts the following options:
-
-	```
-	  -DWITH_XC_AUTOTYPE=[ON|OFF] Enable/Disable Auto-Type (default: ON)
-	  -DWITH_XC_YUBIKEY=[ON|OFF] Enable/Disable YubiKey HMAC-SHA1 authentication support (default: OFF)
-	  -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_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_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)
-	  -DWITH_GUI_TESTS=[ON|OFF] Enable/Disable building of GUI tests (default: OFF)
-	  -DWITH_DEV_BUILD=[ON|OFF] Enable/Disable deprecated method warnings (default: OFF)
-	  -DWITH_ASAN=[ON|OFF] Enable/Disable address sanitizer checks (Linux / macOS only) (default: OFF)
-	  -DWITH_COVERAGE=[ON|OFF] Enable/Disable coverage tests (GCC only) (default: OFF)
-	  -DWITH_APP_BUNDLE=[ON|OFF] Enable Application Bundle for macOS (default: ON)
-
-	  -DKEEPASSXC_BUILD_TYPE=[Snapshot|PreRelease|Release] Set the build type to show/hide stability warnings (default: "Snapshot")
-	  -DKEEPASSXC_DIST_TYPE=[Snap|AppImage|Other] Specify the distribution method (default: "Other")
-	  -DOVERRIDE_VERSION=[X.X.X] Specify a version number when building. Used with snapshot builds (default: "")
-	  -DGIT_HEAD_OVERRIDE=[XXXXXXX] Specify the 7 digit git commit ref for this build. Used with distribution builds (default: "")
-	```
-
-* If you are on MacOS you must add this parameter to **Cmake**, with the Qt version you have installed<br/> `-DCMAKE_PREFIX_PATH=/usr/local/Cellar/qt5/5.6.2/lib/cmake/`
-
-:exclamation: When building with ASan support on macOS, you need to use `export ASAN_OPTIONS=detect_leaks=0` before running the tests (no LSan support in macOS).
+-DKEEPASSXC_BUILD_TYPE=[Snapshot|PreRelease|Release] Set the build type to show/hide stability warnings (default: "Snapshot")
+-DKEEPASSXC_DIST_TYPE=[Snap|AppImage|Other] Specify the distribution method (default: "Other")
+-DOVERRIDE_VERSION=[X.X.X] Specify a version number when building. Used with snapshot builds (default: "")
+-DGIT_HEAD_OVERRIDE=[XXXXXXX] Specify the 7 digit git commit ref for this build. Used with distribution builds (default: "")
+```

 Installation
 ============

 After you have successfully built KeePassXC, install the binary by executing the following:

-```bash
+```
 sudo make install
 ```

-You can specify the destination dir with
-```
-DESTDIR=X
-```
-
-
 Packaging
 =========

-You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..). Refer to [keepassxc-packaging](https://github.com/keepassxreboot/keepassxc-packaging)
+You can create a package to redistribute KeePassXC (zip, deb, rpm, dmg, etc..). Refer to [keepassxc-packaging](https://github.com/keepassxreboot/keepassxc-packaging) for packaging scripts.

+To package using CMake, run the following command using whichever [generators](https://cmake.org/cmake/help/latest/manual/cpack-generators.7.html) you would like to package with.
+
+```
+cpack -G "ZIP;WIX"
+```

 Testing
 =======
@ -151,7 +161,7 @@ You can perform tests on the built executables with:
 make test ARGS+="--output-on-failure"
 ```

-If you are not currently running on an X Server or Wayland, run the tests as follows:
+On Linux, if you are not currently running on an X Server or Wayland, run the tests as follows:
 ```
 make test ARGS+="-E test\(cli\|gui\) --output-on-failure"
 xvfb-run -e errors -a --server-args="-screen 0 1024x768x24" make test ARGS+="-R test\(cli\|gui\) --output-on-failure"
--- a/cmake/KPXCHelpers.cmake
+++ b/cmake/KPXCHelpers.cmake
@ -0,0 +1,33 @@
+function(kpxc_run_macdeployqt_on_installed_helper_binary app_name installed_binary_relative_path)
+    # Running macdeployqt on a POST_BUILD copied binary is not useful for CPack, because
+    # the copied binary will be overriden by the corresponding install(TARGETS) command of the same
+    # binary.
+    # Thus, we run macdeployqt using install(CODE) on the already installed binary.
+    # The precondition is that install(TARGETS) has to be called before this function is called.
+    set(escaped_prefix "\${CMAKE_INSTALL_PREFIX}")
+    set(app_bundle_name "${app_name}.app")
+    set(app_bundle_path "${escaped_prefix}/${app_bundle_name}")
+    set(installed_binary_path "${escaped_prefix}/${installed_binary_relative_path}")
+
+    if(CMAKE_VERSION VERSION_GREATER "3.14")
+        set(command_echo "COMMAND_ECHO STDOUT")
+    else()
+        set(command_echo "")
+    endif()
+
+    install(CODE
+    "
+execute_process(
+    COMMAND
+        ${MACDEPLOYQT_EXE}
+        ${app_bundle_path}
+        -executable=${installed_binary_path} -no-plugins 2> /dev/null
+    ${command_echo}
+    RESULT_VARIABLE exit_code
+)
+if(NOT exit_code EQUAL 0)
+    message(FATAL_ERROR
+        \"Running macdeployqt on ${installed_binary_path} failed with exit code \${exit_code}.\")
+endif()
+")
+endfunction()
--- a/docs/images/autotype_entry_sequences.png
+++ b/docs/images/autotype_entry_sequences.png
--- a/docs/images/autotype_selection_dialog_type_menu.png
+++ b/docs/images/autotype_selection_dialog_type_menu.png
--- a/docs/images/autotype_settings.png
+++ b/docs/images/autotype_settings.png
--- a/docs/images/browser_database_settings.png
+++ b/docs/images/browser_database_settings.png
--- a/docs/images/browser_group_settings.png
+++ b/docs/images/browser_group_settings.png
--- a/docs/images/browser_settings.png
+++ b/docs/images/browser_settings.png
--- a/docs/images/browser_statistics.png
+++ b/docs/images/browser_statistics.png
--- a/docs/images/compact_mode_comparison.png
+++ b/docs/images/compact_mode_comparison.png
--- a/docs/images/csv_import.png
+++ b/docs/images/csv_import.png
--- a/docs/images/database_maintenance.png
+++ b/docs/images/database_maintenance.png
--- a/docs/images/database_settings.png
+++ b/docs/images/database_settings.png
--- a/docs/images/database_view.png
+++ b/docs/images/database_view.png
--- a/docs/images/edit_entry.png
+++ b/docs/images/edit_entry.png
--- a/docs/images/edit_entry_history.png
+++ b/docs/images/edit_entry_history.png
--- a/docs/images/edit_entry_icons.png
+++ b/docs/images/edit_entry_icons.png
--- a/docs/images/enable_copy_dc.png
+++ b/docs/images/enable_copy_dc.png
--- a/docs/images/keeshare_application_settings.png
+++ b/docs/images/keeshare_application_settings.png
--- a/docs/images/main_interface.png
+++ b/docs/images/main_interface.png
--- a/docs/images/open_database.png
+++ b/docs/images/open_database.png
--- a/docs/images/passphrase_generator.png
+++ b/docs/images/passphrase_generator.png
--- a/docs/images/password_generator.png
+++ b/docs/images/password_generator.png
--- a/docs/images/password_generator_advanced.png
+++ b/docs/images/password_generator_advanced.png
--- a/docs/images/quick_unlock.png
+++ b/docs/images/quick_unlock.png
--- a/docs/images/quick_unlock_windows_hello.png
+++ b/docs/images/quick_unlock_windows_hello.png
--- a/docs/images/save_options.png
+++ b/docs/images/save_options.png
--- a/docs/images/theme_selection.png
+++ b/docs/images/theme_selection.png
--- a/docs/images/toolbar.png
+++ b/docs/images/toolbar.png
--- a/docs/images/totp_code_example.png
+++ b/docs/images/totp_code_example.png
--- a/docs/images/totp_setup.png
+++ b/docs/images/totp_setup.png
--- a/docs/images/totp_usage_examples.png
+++ b/docs/images/totp_usage_examples.png
--- a/docs/images/welcome_screen.png
+++ b/docs/images/welcome_screen.png
--- a/docs/topics/AutoType.adoc
+++ b/docs/topics/AutoType.adoc
@ -12,21 +12,27 @@ WARNING: Auto-Type will be disabled when run with a Wayland compositor on Linux.
 === Configure Global Auto-Type
 You can define a global Auto-Type hotkey that starts the Auto-Type process. To configure the hotkey, perform the following steps:

-1. Navigate to _Tools_ -> _Settings_ -> Auto-Type tab *(1)*. Click into the _Global Auto-Type shortcut_ box and press the desired key combination that will trigger the Auto-Type process *(2)*.
-+
+Navigate to _Tools_ -> _Settings_ -> Auto-Type tab *(1)*. Click into the _Global Auto-Type shortcut_ box and press the desired key combination that will trigger the Auto-Type process *(2)*.
+
 .Auto-Type settings
 image::autotype_settings.png[]
-+
+
 You can configure additional Auto-Type settings in this window such as start delay, inter-key typing delay, and matching options. If Auto-Type is not working well for you, try adjusting the default delays.

+You can also set the time to remember the last used entry between presses of the global Auto-Type hotkey. This is useful for typing parts of a sequence during complex login workflows without having to find the specific each time.
+
 === Configure Auto-Type Sequences
 Each entry in your database can have multiple Auto-Type sequences associated with various window titles. Simulated key presses can be sent to any other currently open window of your choice (web browser windows, login dialogs boxes, and so on). When the Global Auto-Type hotkey is pressed, KeePassXC will search your database for entries matching the current selected window title.

 NOTE: The default Auto-Type sequence is `{USERNAME}{TAB}{PASSWORD}{ENTER}`. This means that it first types the username of the selected entry, then presses the `Tab` key, then types the password of the entry and finally presses the `Enter` key.

+TIP: To change the default Auto-Type sequence for all entries of your database, edit the root (top-most) group of your database and set a specific sequence. Child groups and entries will inherit this sequence by default.
+
 To configure Auto-Type sequences for your entries, perform the following steps:

-1.	Navigate to the entries list and open the desired entry for editing. Click the _Auto-Type_ item from the left-hand menu bar *(1)*. Press the `+` button *(2)* to add a new sequence entry. Select the desired window using the drop-down menu, or simply type a window title in the box *(3)*. You can use wildcard `*` to match any value (e.g., when a window title contains a filename or website name).
+1.	Navigate to the entries list and open the desired entry for editing. Click the _Auto-Type_ item from the left-hand menu bar *(1)*. Press the `+` button *(2)* to add a new sequence entry. Select the desired window using the drop-down menu, or simply type a window title in the box *(3)*.
+
+TIP: You can use an asterisk (`\*`) to match any value (e.g., when a window title contains a dynamic filename or website name). Set the window title to `*` to match all windows. Leave the window title blank to offer additional default Auto-Type sequences, such as custom attributes.
 +
 .Auto-Type entry sequences
 image::autotype_entry_sequences.png[]
@ -43,7 +49,7 @@ image::autotype_entry_sequences.png[]
 |{URL}      |URL
 |{NOTES}    |Notes
 |{TOTP}     |Current TOTP value (if configured)
-|{S:<ATTRIBUTE_NAME>}   |Value for the given attribute name
+|{S:ATTRIBUTE_NAME}   |Value for the given attribute name (e.g., {S:Address})
 |===
 +
 [grid=rows, frame=none, width=90%]
@ -55,11 +61,12 @@ image::autotype_entry_sequences.png[]

 |{UP}, {DOWN}, {LEFT}, {RIGHT}  |Press the corresponding arrow key
 |{LEFTBRACE}, {RIGHTBRACE}      |Press `{` or `}`, respectively
-|{<KEY> X}     |Repeat <KEY> X times (e.g., {SPACE 5} inserts five spaces)
+|{&lt;KEY&gt; X}     |Repeat &lt;KEY&gt; X times (e.g., {SPACE 5} inserts five spaces)
 |{DELAY=X}     |Set delay between key presses to X milliseconds
 |{DELAY X}     |Pause typing for X milliseconds
 |{CLEARFIELD}  |Clear the input field
 |{PICKCHARS}   |Pick specific password characters from a dialog
+|{MODE=VIRTUAL} |(Experimental) Use virtual key presses on Windows, useful for virtual machines
 |===

 === Performing Global Auto-Type
@ -80,7 +87,9 @@ 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. You can also copy these values to the clipboard.
+
+TIP: On Windows, you will see an option to use a virtual keyboard in this sub-menu. This is an experimental feature that allows you to type into virtual machines by simulating actual keyboard presses. Some international keyboards may be unsupported due to limitations in the Windows API.

 === 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`.
--- a/docs/topics/BrowserPlugin.adoc
+++ b/docs/topics/BrowserPlugin.adoc
@ -23,6 +23,8 @@ You can download the KeePassXC-Browser extension from your web browser. To downl

 2. Click the button to install/add the extension to the browser. Accept any confirmation dialogs.

+TIP: For the most up-to-date troubleshooting advice on all platforms, please read our https://github.com/keepassxreboot/keepassxc-browser/wiki/Troubleshooting-guide[Troubleshooting Guide].
+
 // tag::advanced[]
 NOTE: When Microsoft Edge is installed as a managed application, system administrators are required to deploy a custom native messaging configuration. Instructions for this are found in the advanced section below.
 // end::advanced[]
@ -89,6 +91,12 @@ image::browser_confirm_access_dialog.png[,80%]
 image::browser_fill_credentials.png[,80%]

 // tag::advanced[]
+=== Browser statistics
+You can see a cross-section of all browser-related settings applied to entries within a database through the Browser Statistics report. To access these, use the _Database_ -> _Database reports..._ menu option then click on _Browser Statistics_ on the left-hand menu. From here you can see all entries with URLs applied to them, explicitly allowed and denied URLs, and any entries with custom browser settings.
+
+.Browser statistics
+image::browser_statistics.png[]
+
 === Advanced Usage
 You can configure unique browser integration behavior for each entry. This allows you to add multiple URLs to an entry, hide an entry from the browser integration, and more. To access these settings, open an entry for editing then click on _Browser Integration_ option in the left-hand menu *(1)*.

@ -97,6 +105,11 @@ After opening the settings you can add any number of additional URLs by clicking
 .Entry browser settings
 image::browser_entry_settings.png[]

+To set options for all entries within a group, edit the group and go to the browser integration section *(1)*. Here you can explicitly disable access to all entries under a group hierarchy to the browser extension. You can set other useful options for groups of entries as well.
+
+.Group browser settings
+image::browser_group_settings.png[]
+
 Database-wide operations are available in the database settings. To access these use the _Database_ -> _Database settings..._ menu option. Click on _Browser Integration_ on the left-hand menu. From here you can disconnect all browsers, convert legacy KeePass-HTTP settings, reset all entry-level settings, and refresh the database root group ID (useful when making copies of your database file).

 .Database browser settings
--- a/docs/topics/DatabaseOperations.adoc
+++ b/docs/topics/DatabaseOperations.adoc
@ -58,6 +58,37 @@ image::unlock_database.png[]
 .Unlocked database
 image::database_view.png[]

+=== Quick Unlock
+On Windows and macOS, subject to hardware availability, your credentials can be securely stored to enable subsequent unlocking of your database through biometric authentication. This is enabled by default on Windows using _Windows Hello_ and on macOS using _Touch ID or Apple Watch_ services. You can disable this feature in the Application Settings under the Security section.
+
+NOTE: On Windows you will be prompted to authenticate to Windows Hello on the initial database unlock. This is required to access the hardware certificate store that encrypts your credentials.
+
+.Windows Hello example
+image::quick_unlock_windows_hello.png[]
+
+When your database is locked, you will see the following unlock dialog. Simply press _Enter_ or click on _Unlock Database_ to initiate the biometric authentication process. If you are using a hardware key (e.g. Yubikey), it must be connected to your computer to complete the unlock.
+
+.Quick Unlock
+image::quick_unlock.png[]
+
+// tag::advanced[]
+=== Expired Entries
+By default, KeePassXC will show entries that are expired or will be expiring within 3 days after unlocking the database. This feature allows you to change your passwords before they expire and be aware of passwords that are no longer valid. You can disable or change this feature in the Application Settings.
+
+=== Advanced Save Options
+There are three ways that KeePassXC can handle database files. This behavior is set in the Application Settings under _File Operations_.
+
+1. _(Default)_ *Safe saves* create a temporary database file alongside the existing one and atomically move it into place when all writing is complete. This prevents database corruption in the case of application crashes, loss of power, or other interruptions.
+
+2. *Temporary file saves* create a database in the temporary files folder. This database is then moved into place overtop of the existing file. Although rare, interruptions in this move process could leave your database in an unknown state. This option is useful for overcoming poorly behaved cloud sync tools.
+
+3. *Direct-write saves* write directly to the existing database file. This is an unsafe operation since any interruption can leave your entire database inaccessible. We only recommend using this option when interfacing with Linux GVFS services (e.g. Google Cloud on Gnome) and other types of storage services that host a virtual drive system.
+
+In addition to these save options, KeePassXC can create a backup of your existing database file just prior to saving. This backup can be placed in a custom folder with a custom file naming scheme.
+
+image::save_options.png[]
+// end::advanced[]
+
 === Adding an Entry
 All the details such as usernames, passwords, URLs, attachments, notes, and so on are stored in database entries. You can create as many entries as you want in the database.

@ -69,10 +100,17 @@ To add an entry, perform the following step:
 image::edit_entry.png[]

 2. Enter a desired title for the entry, username, password, URL, and notes on this screen.
+   a. Your most frequently used usernames will automatically be available in the username drop-down menu. They will also auto-complete for you when typing.

-3. _(Optional)_ Select the Expires check-box to set the expiry date for the password. You can manually enter the date and time or click the Presets button to select a expiry date and time for your password.
+   b. You can generate a secure random password by clicking the dice icon in the password field to launch the password generator. Reveal the password by clicking the eye icon.

-4. Click *OK* to add the entry to your database.
+   c. After you add a URL to an entry you can press the download button to automatically download the website's icon for this entry.
+
+3. _(Optional)_ Add tags to the entry to quickly search for it using the tags panel on the main database view. You can easily add new tags or select existing ones from the drop-down list.
+
+4. _(Optional)_ Select the _Expires_ check-box to set the expiry date for the password. You can manually enter the date and time or click the _Presets_ button to select an expiry date and time for your password.
+
+5. Click *OK* to add the entry to your database.

 === Editing an Entry
 To edit the details in an entry, perform the following steps:
@ -85,6 +123,28 @@ To edit the details in an entry, perform the following steps:

 4. Click *OK*.

+=== Adding TOTP to an Entry
+Timed One-Time Passwords (TOTP) are a popular choice for two-factor authentication methods. These codes are typically six digits long and change every 30 seconds. They are derived from a shared secret value and the current time. Once set up, KeePassXC can calculate TOTP codes like any authenticator app, such as Google Authenticator. The codes can be used with copy/paste, browser extension, and Auto-Type.
+
+TIP: Your computer time must be synchronized with an internet time source to generate valid TOTP codes, https://www.nist.gov/pml/time-and-frequency-division/time-distribution/internet-time-service-its[read more here].
+
+WARNING: Storing TOTP codes in the same database as the password will eliminate the advantages of two-factor authentication. If you desire maximum security, we recommend keeping TOTP codes in a separate database that you only unlock when needed.
+
+To add TOTP to a database entry, you must first retrieve the secret string from the website or application you are authenticating to. Often this secret is accompanied with a QR code and can be copy/pasted below. Example:
+
+.Example TOTP Secret
+image::totp_code_example.png[,40%]
+
+Once obtained, right-click the desired entry *(1)*, choose _TOTP_ -> _Set up TOTP..._ *(2)*, and the setup dialog will appear. In that dialog, paste the secret code from the website *(3)*, setup any custom settings (rare) *(4)*, then press OK to save the settings.
+
+.TOTP Setup Process
+image::totp_setup.png[]
+
+After an entry is configured with TOTP, you will see a clock icon in that entry's row and have the ability to reveal the current code in the preview pane. Additionally, you can navigate to the entry's _TOTP_ menu to show the code in a separate window. You can also view the secret and configuration as a QR code for exporting to a mobile device. TOTP codes can be entered into forms with the browser extension, with Auto-Type by using the `{TOTP}` placeholder, or via menu options in the Auto-Type selection dialog.
+
+.TOTP Usage
+image::totp_usage_examples.png[]
+
 === Deleting an Entry
 To delete an entry, perform the following steps:

@ -143,9 +203,10 @@ The following fields can be searched along with their abbreviated name in parent
 * Password (p, pw)
 * URL
 * Notes (n)
-* Attribute (attr)
+* Attribute names and values (attr)
 * Attachment (attach)
 * Group (g)
+* Entry State (is:expired, is:weak)

 === Wild Card Characters and Logical Operators
 [grid=rows, frame=none, width=70%]
@ -173,7 +234,10 @@ The following tables lists a few samples search queries for your reference:
 |Search the username field for exactly johnsmith, the URL must not contain www.google.com, and notes contains secret note [digit].

 |`+attr:mystring123`
-|Searches all Additional Attributes for any name OR value equal to mystring123.
+|Searches all additional attributes for any name OR value equal to mystring123.
+
+|`is:expired is:weak`
+|Searches for all expired entries with weak passwords.
 |===

 == Advanced Entry Options
@ -202,7 +266,7 @@ image::edit_entry_colors.png[]
 === Icons
 You can select an icon to be displayed with each entry for easy identification. KeePassXC comes with a set of default icons that you can use or you can use your own custom icons. If you defined a URL with an entry, you can also download the favorite icon for that particular website.

-NOTE: To delete a custom icon, select the item to be deleted and click the _Delete custom icon_ button.
+NOTE: To delete a custom icon, go to xref:UserGuide.adoc#_database_maintenance[Database Maintenance] where you can purge unused icons and delete one or more icons at a time.

 .Entry icon selection
 image::edit_entry_icons.png[]
@ -216,7 +280,7 @@ KeePassXC lets you view the basic properties such as date and time of creation,
 image::edit_entry_properties.png[]

 === History
-KeePassXC maintains a history of changes you make to your entries. Each time you change an entry, KeePassXC automatically creates a backup copy of the current, non-modified entry before saving the new values. You can view the changes you made previously, restore, and delete the history of changes you made.
+KeePassXC maintains a history of changes you make to your entries. Each time you change an entry, KeePassXC automatically creates a backup copy of the current, non-modified entry before saving the new values. You can view the changes you made previously, restore, and delete the history of changes you made. The age of the history item, the changes that were made, and the entry's size are shown in the table view.

 * Show: Display this history item for review, a read-only copy of the entry will be shown.
 * Restore: Reinstate the selected history item as the active entry details.
@ -298,7 +362,12 @@ The following key derivation functions are supported:

 * AES-KDF (KDBX 4 and KDBX 3.1): This key derivation function is based on iterating AES. Users can change the number of iterations. The more iterations, the harder are dictionary and guessing attacks, but also database loading/saving takes more time (linearly). KDBX 3.1 only supports AES-KDF; any other key derivation function, like for instance Argon2, requires KDBX 4.

- * Argon2 (KDBX 4 - recommended): KDBX 4, the Argon2 key derivation function can be used for transforming the composite master key (as protection against dictionary attacks). The main advantage of Argon2 over AES-KDF is that it provides a better resistance against GPU/ASIC attacks (due to being a memory-hard function). The number of iterations scales linearly with the required time. By increasing the memory parameter, GPU/ASIC attacks become harder (and the required time increases). The parallelism parameter can be used to specify how many threads should be used.
+ * Argon2 (KDBX 4 - recommended): KDBX 4, the Argon2 key derivation function can be used for transforming the composite master key (as protection against dictionary attacks). The main advantage of Argon2 over AES-KDF is that it provides a better resistance against GPU/ASIC attacks (due to being a memory-hard function). The number of iterations scales linearly with the required time. By increasing the memory parameter, GPU/ASIC attacks become harder and the required time increases. The parallelism parameter can be used to specify how many threads should be used. We recommend using Argon2id to prevent against  timing-based attacks. Argon2d offers maximum compatibility with other KeePass-based apps, the default settings provide sufficient protection against any known attacks.
+
+== Database Maintenance
+KeePassXC offers some maintenance features that can be applied to clean up your database. Navigate to _Database_ -> _Database settings_ then click on _Maintenance_ on the left hand panel. The following screen appears. On this screen you can delete multiple icons at once and purge any unused icons in your database.
+
+image::database_maintenance.png[]

 === Creating a YubiKey backup
 It is advisable to have a backup replica YubiKey In case your main YubiKey gets damaged, lost, or stolen. The same HMAC key will need to be written to both keys. To do this you can either use the YubiKey Personalization Tool GUI or the ykpersonalize CLI tool. The steps for the CLI tool are shown:
@ -315,19 +384,22 @@ dd status=none if=/dev/random bs=20 count=1 | xxd -p -c 40
 ykpersonalize -2 -a -ochal-resp -ochal-hmac -ohmac-lt64 -oserial-api-visible -oallow-update
 ```

-You will be asked to enter the HMAC key you created earlier, copy/paste they key output in the first step. Repeat both steps for your second YubiKey. We recommend storing your HMAC key in a safe place (e.g., printed on paper) in case you need to recreate another key.
+You will be asked to enter the HMAC key you created earlier, copy/paste they key output in the first step. Repeat step 2 for your second YubiKey using the same HMAC key from before. We recommend storing your HMAC key in a safe place (e.g., printed on paper) in case you need to recreate another key.
+
+== Command Line Tool
+KeePassXC comes with the command line tool *keepassxc-cli* to access, view, and manipulate your database directly from a terminal window. The tool is documented through a separate man page, which can be shown using `man keepassxc-cli`, or through the on-demand help using `keepassxc-cli [command] -h`. An online version of the man page is https://github.com/keepassxreboot/keepassxc/blob/master/docs/man/keepassxc-cli.1.adoc[available on GitHub].
 // end::advanced[]

 == Storing a Database File
 The database file that you create might contain highly sensitive data and must be stored in a very secure way. You must make sure that the database is always protected with a strong and long password. The database file that is protected with a strong and long password is secure and encrypted while stored on your computer or cloud storage service.

-Make sure that the database file is stored in a folder that is secure. Make sure that you or someone else does not accidentally delete the database file. Deletion of the database file will result in the total loss of your information and a lot of inconvenience to manually retrieve your logins for  various web applications. You must not share your database file with anyone unless absolutely necessary.
+Make sure that you or someone else does not accidentally delete the database file. Deletion of the database file will result in the total loss of all your information (including all your passwords!) and a lot of inconvenience to manually retrieve your logins for various web applications. Do not share the credentials to access your database file with anyone unless you absolutely trust them (spouse, child, etc.).
+
+TIP: You can safely store your database file in the cloud (e.g., OneDrive, Dropbox, Google Drive, Nextcloud, Syncthing, etc). The database file is always fully encrypted; unencrypted data is never written to disk and is never accessible to your cloud storage provider. We recommend using a storage service that keeps automatic backups (version history) of your database file in the event of corruption or accidental deletion.

 ==  Backing up a Database File
 It is a good practice to create copies of your database file and store the copies of your database on a different computer, smart phone, or cloud storage space such a Google Drive or Microsoft OneDrive. Backups can be created automatically by selecting the _Backup database file before saving_ option in the application settings. Additionally, you can create a backup on-demand using the _Database_ -> _Save Database Backup..._ menu feature.

 .Saving a database backup
 image::save_database_backup.png[,40%]
-
-Creating backups for your database give you a peace of mind should you lose one copy of your database. You can quickly retrieve the copy of your database and start using it.
 // end::content[]
--- a/docs/topics/DownloadInstall.adoc
+++ b/docs/topics/DownloadInstall.adoc
@ -43,6 +43,14 @@ image::install_wizard_1.png[,80%]
 .Install wizard (cont)
 image::install_wizard_2.png[,80%]

+The following options can be set when running the MSI in an unattended installation:
+
+* *LAUNCHAPPONEXIT* - Launch KeePassXC after install (default ON)
+* *AUTOSTARTPROGRAM* - KeePassXC will auto-start on login (default ON)
+* *INSTALLDESKTOPSHORTCUT* - A desktop icon will be installed (default OFF)
+
+Example: `msiexec.exe /q /i KeePassXC-Y.Y.Y-WinZZ.msi AUTOSTARTPROGRAM=0`
+
 === Linux
 You can easily download the KeePassXC installer for Linux. When you search for KeePassXC, multiple options are displayed as shown in the following screen:

--- a/docs/topics/ImportExport.adoc
+++ b/docs/topics/ImportExport.adoc
@ -21,10 +21,10 @@ To open the CSV file, perform the following steps:

 3. Navigate to the location of the your CSV file on your computer and open the file. The new database wizard will appear. Follow the steps of creating a new database in Chapter 1.

-4. After saving your new database file, the CSV import wizard will appear:
+4. After saving your new database file, the CSV import wizard will appear. On this dialog you can choose the various options for properly importing the data. You may need to select the _First line has field names_ checkbox before starting. Analyze the output in the preview at the bottom to determine the correct import settings.
 +
 .CSV Import Wizard
-image::csv_import.png[,80%]
+image::csv_import.png[]

 Your CSV file gets imported to KeePassXC and the data is converted to the KeePassXC format for further usage and maintenance. The new database file is saved on to your computer with the default `.kdbx` extension.

@ -55,9 +55,9 @@ To import a KeePass 1 database file in KeePassXC, perform the following steps:
 6. The data from the `.kdb` file gets imported and converted to the new format, which is compatible with KeePassXC. You can now start using the new database file (`.kdbx`) in KeePassXC.

 == Exporting Databases
-KeePassXC supports multiple ways to export your database for transfer to another program or to print out and archive. To export your database into the KDB XML format, you must use the KeePassXC Command Line Interface program: `keepassxc-cli export <database.kdbx>`.
+KeePassXC supports multiple ways to export your database for transfer to another program or to print out and archive. To export your database into the KDB XML format, you must use the KeePassXC CLI: `keepassxc-cli export <database.kdbx>`.

-WARNING: Exporting your database will result in all of your passwords and sensitive information being stored unencrypted. We do not recommend saving your exported database for long periods of time as that can cause compromise.
+WARNING: Exporting your database will result in all of your passwords and sensitive information being stored in an unencrypted format. We do not recommend saving your exported database for long periods of time as that can cause a compromise of sensitive information.

 .Database export menu
 image::export_database.png[,80%]
--- a/docs/topics/KeeShare.adoc
+++ b/docs/topics/KeeShare.adoc
@ -11,7 +11,7 @@ To use sharing, you need to enable it for the application.

 1. Go to _Tools_ -> _Settings_. Select the KeeShare category on the left sidebar *(1)*.
 2. Check _Allow import_ if you want to import shared credentials. Check _Allow export_ if you want to share credentials. *(2)*
-3. (Optional) Click _Generate_ *(3)* to create your own certificate or _Import_ to select an existing one. The certificate allows you to sign shared databases. This ensures the integrity of the share and prevent import of untrusted information.
+3. (Optional) Click _Generate_ *(3)* to create your own signing certificate. If you are using signed shares then your signing certificate will be used to generate the signature. *_This feature is deprecated and will be removed in a future version._*

 .KeeShare Application Settings
 image::keeshare_application_settings.png[]
--- a/docs/topics/PasswordGenerator.adoc
+++ b/docs/topics/PasswordGenerator.adoc
@ -26,10 +26,9 @@ image::password_generator.png[]
 +
 .Advanced Password Generator Options
 image::password_generator_advanced.png[]
-8. When generating a password for an entry, click the Apply Password button (Ctrl + S or Ctrl + Enter) to close the window and apply your changes.

 === Generating Passphrases
-A passphrase is a sequence of words or other text used to control access to your applications and data. A passphrase is similar to a password in usage, but is generally longer for added security. To generate the random passphrase using Password Generator, perform the following steps:
+A passphrase is a sequence of words or other text used to control access to your applications and data. A passphrase is specifically designed to be simple to remember but hard to guess. For this reason, we do not recommend making passphrases too complex; if you require something that is more complex than you could easily remember, it is better to use a randomly generated password instead.

 1. From the password generator, click the Passphrase tab. The following screen appears:
 +
@ -38,9 +37,10 @@ image::passphrase_generator.png[]

 2. Select the number of words you want to be included in your passphrase by dragging the
 Word Count slider.
-3. In the Word Separator field, enter a character, word, number, or space that you want to use a separator between the words in your passphrase.
+3. In the Word Separator field, enter a character, word, number, or space that you want to use as a separator between the words in your passphrase.
+4. _(Optional)_ You can choose a word case between lower, upper, and title case options.
+5. _(Optional)_ You can also load your own custom word lists. Click the plus sign button to the right of the wordlist selection dialog to choose a custom word list. You can download alternative lists from the https://www.eff.org/deeplinks/2016/07/new-wordlists-random-passphrases[EFF's Website] or from https://github.com/redacted/XKCD-password-generator#additional-languages[GitHub].
 4. Click the Regenerate button (Ctrl + R) to generate a new random passphrase.
 5. Click the Clipboard button (Ctrl + C) to copy the passphrase to the clipboard.
-6. When generating a password for an entry, click the Apply Password button (Ctrl + S or Ctrl + Enter) to close the window and apply your changes.
 // end::advanced[]
 // end::content[]
--- a/docs/topics/Reference.adoc
+++ b/docs/topics/Reference.adoc
@ -17,7 +17,7 @@ This section contains full details on advanced features available in KeePassXC.
 |{URL}           |URL
 |{NOTES}         |Notes
 |{TOTP}          |Current TOTP value (if configured)
-|{S:<ATTRIBUTE_NAME>}   |Value for the given attribute (case sensitive)
+|{S:&lt;ATTRIBUTE_NAME&gt;}   |Value for the given attribute (case sensitive)
 |{URL:RMVSCM}	        |URL without scheme (e.g., https)
 |{URL:WITHOUTSCHEME}	|URL without scheme
 |{URL:SCM}	     |URL Scheme
@ -49,9 +49,9 @@ 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:
-`{REF:<FIELD>@<SEARCH_IN>:<SEARCH_TEXT>}`
+`{REF:&lt;FIELD&gt;@&lt;SEARCH_IN&gt;:&lt;SEARCH_TEXT&gt;}`

-`<FIELD>` and `<SEARCH_IN>` can be one of following:
+`&lt;FIELD&gt;` and `&lt;SEARCH_IN&gt;` can be one of following:

 * T - Title
 * U - Username
@ -77,7 +77,7 @@ Examples: +
 |{UP}, {DOWN}, {LEFT}, {RIGHT}  |Press the corresponding arrow key
 |{F1}, {F2}, ..., {F16}         |Press F1, F2, etc.
 |{LEFTBRACE}, {RIGHTBRACE}      |Press `{` or `}`, respectively
-|{<KEY> X}  |Repeat <KEY> X times (e.g., {SPACE 5} inserts five spaces)
+|{&lt;KEY&gt; X}  |Repeat &lt;KEY&gt; X times (e.g., {SPACE 5} inserts five spaces)
 |{DELAY=X}     |Set delay between key presses to X milliseconds
 |{DELAY X}     |Pause typing for X milliseconds
 |{CLEARFIELD}  |Clear the input field
@ -86,9 +86,9 @@ Examples: +

 *Text Conversions:*

-*{T-CONV:/<PLACEHOLDER>/<METHOD>/}* +
+`{T-CONV:/&lt;PLACEHOLDER&gt;/&lt;METHOD&gt;/}` +
 Convert resolved placeholder (e.g., {USERNAME}, {PASSWORD}, etc.) using the following methods: UPPER, LOWER, BASE64, HEX, URI, URI-DEC.

-*{T-REPLACE-RX:/<PLACEHOLDER>/<SEARCH>/<REPLACE>/}* +
+`{T-REPLACE-RX:/&lt;PLACEHOLDER&gt;/&lt;SEARCH&gt;/&lt;REPLACE&gt;/}` +
 Use regular expressions to find and replace data from a resolved placeholder. Refer to match groups using $1, $2, etc.
 // end::content[]
--- a/docs/topics/UserInterface.adoc
+++ b/docs/topics/UserInterface.adoc
@ -12,11 +12,13 @@ image::main_interface.png[]

 *(A) Groups* - Organize your entries into discrete groups to bring order to all of your sensitive information. Groups can be nested under each other to create a hierarchy. Settings from parent groups get applied to their children. You can hide this panel on the View menu.

-*(B) Entries* - Entries contain all the information for each website or application you are storing in KeePassXC. This view shows all the entries in the selected group. Each column can be resized, reordered, and shown or hidden based on your preference. Right click the header row to see all available options.
+*(B) Tags* - Dynamic groups of entries that can be quickly displayed with one click. Any number of custom tags can be added when editing an entry. This panel also includes useful pre-defined searches, such as finding expired and weak passwords.

-*\(C) Preview* - Shows a preview of the selected group or entry. You can temporarily hide this preview using the close button on the right hand side or completely disabled in the application settings.
+*\(C) Entries* - Entries contain all the information you want to store for a website or application you are storing in KeePassXC. This view shows all the entries in the selected group. Each column can be resized, reordered, and shown or hidden based on your preference. Right-click the header row to see all available options.

-TIP: Double clicking on the text in the entries list copies that field to the clipboard. Double clicking the entry title will open the entry for editing.
+*(D) Preview* - Shows a preview of the selected group or entry. You can temporarily hide this preview using the close button on the right hand side or completely disabled in the application settings.
+
+TIP: You can enable double-click copying of entry username and password in the Application Security Settings. This is turned off by default starting with version 2.7.0.

 === Toolbar
 The toolbar provides a quick way to perform common tasks with your database. Some entries in the toolbar are dynamically disabled based on the information contained in the selected entry. Every common action in KeePassXC can be controlled with a keyboard shortcut as well.
@ -24,12 +26,11 @@ The toolbar provides a quick way to perform common tasks with your database. Som
 .Toolbar overview
 image::toolbar.png[]

-*(A) Database* - Open Database, Save Database +
-*(B) Entries* - Create Entry, Edit Selected Entry, Delete Selected Entry +
+*(A) Database* - Open Database, Save Database, Lock Database +
+*(B) Entries* - Create Entry, Edit Entry, Delete Selected Entries +
 *\(C) Entry Data* - Copy Username, Copy Password, Copy URL, Perform Auto-Type +
-*(D) Lock All Databases* +
-*(E) Tools* - Password Generator, Application Settings +
-*(F) Search*
+*(D) Tools* - Password Generator, Application Settings +
+*(E) Search*

 === Application Settings
 Users can configure KeePassXC to their personal tastes with a wide variety of general and security settings that apply to the whole application. These settings are accessible from _Tools_ -> _Settings_ or the cog wheel icon from the toolbar. Settings include: startup options, file management, entry management, user interface, language, security timeouts, and convenience.
@ -46,13 +47,8 @@ For users with smaller screens or those who desire seeing more entries at once,
 .Compact mode comparison
 image::compact_mode_comparison.png[]

-==== Copy entry Columns on Double Click
-KeePassXC offers the possibility of copying certain entry columns, such as username and password, into your clipboard on double click, for a limited period of time.
-
-This feature can be enabled by checking the box "Enable double click to copy some entry columns" in the security settings:
-
-.Enable copying on double click
-image::enable_copy_dc.png[]
+=== Screenshot Security
+By default, KeePassXC prevents recordings and screenshots of the application window on Windows and macOS. This prevents inadvertent spillage of information during meetings and disallows other applications to capture the window contents. If you would like to enable screen capture, you must start the application with the `--allow-screencapture` command line flag.

 === Keyboard Shortcuts
 include::KeyboardShortcuts.adoc[tag=content, leveloffset=+1]
@ -71,9 +67,11 @@ Options:
  -v, --version                Displays version information.
  --config <config>            path to a custom config file
  --localconfig <localconfig>  path to a custom local config file
+  --lock                       lock all open databases
  --keyfile <keyfile>          key file of the database
  --pw-stdin                   read password of the database from stdin
  --debug-info                 Displays debugging information.
+  --allow-screencapture        Allow screen recording and screenshots

 Arguments:
  filename(s)                  filenames of the password databases to open (*.kdbx)
--- a/6
+++ b/6
@ -347,11 +347,7 @@ checkSnapcraft() {
        return
    fi

-    if ! grep -qEzo "version: ${RELEASE_NAME}" snap/snapcraft.yaml; then
-        exitError "'snapcraft.yaml' has not been updated to the '${RELEASE_NAME}' release!"
-    fi
-
-    if ! grep -qEzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml; then
+    if ! $GREP -qPzo "KEEPASSXC_BUILD_TYPE=Release" snap/snapcraft.yaml; then
        exitError "'snapcraft.yaml' is not set for a release build!"
    fi
 }
--- a/release-tool.ps1
+++ b/release-tool.ps1
@ -37,7 +37,6 @@ param(
    [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)]
@ -133,11 +132,6 @@ function Test-VersionInFiles {
                -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."
    }
-
-    # Check Snapcraft
-    if (!(Select-String "$SourceDir\snap\snapcraft.yaml" -pattern "version: $Version" -Quiet)) {
-        throw "snap/snapcraft.yaml has not been updated to $Version."
-    }
 }

 function Test-WorkingTreeClean {
@ -263,7 +257,7 @@ if ($ExtraPath) {
 $SourceDir = (Resolve-Path $SourceDir).Path

 # Check format of -Version
-if ($Version -notmatch "^\d+\.\d+\.\d+$") {
+if ($Version -notmatch "^\d+\.\d+\.\d+(-Beta\d*)?$") {
    throw "Invalid format for -Version input"
 }

@ -333,8 +327,6 @@ if ($Merge) {
    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) {
-    $OutDir = (Resolve-Path $OutDir).Path
-    $BuildDir = "$OutDir\build-release"
    $Vcpkg = (Resolve-Path $Vcpkg).Path

    # Find Visual Studio and establish build environment
@ -356,7 +348,7 @@ if ($Merge) {
            Remove-Item $OutDir -Recurse
        }
        
-        if ($Version -match "-beta\\d+$") {
+        if ($Version -match "-beta\d*$") {
            $CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=PreRelease"
        } else {
            $CMakeOptions = "$CMakeOptions -DKEEPASSXC_BUILD_TYPE=Release"
@ -372,6 +364,9 @@ if ($Merge) {

    # 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
--- a/share/icons/application/scalable/actions/key-enter.svg
+++ b/share/icons/application/scalable/actions/key-enter.svg
@ -1 +0,0 @@
-<?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-keyboard-variant" width="24" height="24" viewBox="0 0 24 24"><path d="M6,16H18V18H6V16M6,13V15H2V13H6M7,15V13H10V15H7M11,15V13H13V15H11M14,15V13H17V15H14M18,15V13H22V15H18M2,10H5V12H2V10M19,12V10H22V12H19M18,12H16V10H18V12M8,12H6V10H8V12M12,12H9V10H12V12M15,12H13V10H15V12M2,9V7H4V9H2M5,9V7H7V9H5M8,9V7H10V9H8M11,9V7H13V9H11M14,9V7H16V9H14M17,9V7H22V9H17Z" /></svg>
--- a/share/icons/application/scalable/actions/password-generate.svg
+++ b/share/icons/application/scalable/actions/password-generate.svg
@ -1 +0,0 @@
-<?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-dice-3-outline" width="24" height="24" viewBox="0 0 24 24"><path d="M19 5V19H5V5H19M19 3H5C3.9 3 3 3.9 3 5V19C3 20.1 3.9 21 5 21H19C20.1 21 21 20.1 21 19V5C21 3.9 20.1 3 19 3M12 10.5C11.2 10.5 10.5 11.2 10.5 12S11.2 13.5 12 13.5 13.5 12.8 13.5 12 12.8 10.5 12 10.5M7.5 6C6.7 6 6 6.7 6 7.5S6.7 9 7.5 9 9 8.3 9 7.5 8.3 6 7.5 6M16.5 15C15.7 15 15 15.7 15 16.5C15 17.3 15.7 18 16.5 18C17.3 18 18 17.3 18 16.5C18 15.7 17.3 15 16.5 15Z" /></svg>
--- a/share/icons/icons.qrc
+++ b/share/icons/icons.qrc
@ -50,7 +50,6 @@
        <file>application/scalable/actions/health.svg</file>
        <file>application/scalable/actions/help-about.svg</file>
        <file>application/scalable/actions/hibp.svg</file>
-        <file>application/scalable/actions/key-enter.svg</file>
        <file>application/scalable/actions/lock-question.svg</file>
        <file>application/scalable/actions/keyboard-shortcuts.svg</file>
        <file>application/scalable/actions/message-close.svg</file>
@ -60,7 +59,6 @@
        <file>application/scalable/actions/object-unlocked.svg</file>
        <file>application/scalable/actions/paperclip.svg</file>
        <file>application/scalable/actions/password-copy.svg</file>
-        <file>application/scalable/actions/password-generate.svg</file>
        <file>application/scalable/actions/password-generator.svg</file>
        <file>application/scalable/actions/password-show-off.svg</file>
        <file>application/scalable/actions/password-show-on.svg</file>
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@ -50,6 +50,94 @@
    </screenshots>

    <releases>
+        <release version="2.7.0" date="2022-02-26">
+            <description>
+                <ul>
+                    <li>Implement KDBX 4.1 [#7114]</li>
+                    <li>Add direct write save option for cloud storage and GVFS [#6594]</li>
+                    <li>Prevent screen capture on Windows and macOS [#6030]</li>
+                    <li>Support quick unlock using Windows Hello [#7384]</li>
+                    <li>Support quick unlock using Apple Watch [#5526]</li>
+                    <li>Allow specifying database backup paths [#7035]</li>
+                    <li>Add tag functionality [#6487][#7436][#7446]</li>
+                    <li>Add password rating column to entry view [#4797]</li>
+                    <li>Add group clone action [#6124]</li>
+                    <li>Show modifications between entry history items [#6789]</li>
+                    <li>Ability to bulk-delete and purge unused custom icons [#5970]</li>
+                    <li>Support adding custom passphrase wordlists [#6799]</li>
+                    <li>Support passphrase wordlists in numbered and PGP-signed formats [#6791]</li>
+                    <li>Implement support for hardware keys via wireless NFC [#6895]</li>
+                    <li>SSH Agent: Add support for OpenSSH 8.2 FIDO/U2F keys [#6371]</li>
+                    <li>CLI: Implement attachment handling [#5538]</li>
+                    <li>CLI: Add support for okon in offline HIBP checks [#5478]</li>
+                    <li>CLI: Implement `search` command and remove `locate` [#6805]</li>
+                    <li>CLI: Add db statistic output to `db-info` command [#7032]</li>
+                    <li>CLI: Add -i/--include option to `generate` command. [#7112]</li>
+                    <li>CLI: Add a -n (--notes) option to `add` and `edit` commands [#4646]</li>
+                    <li>CLI: Add keyfile option to `import` command [#5402]</li>
+                    <li>CLI: Adding a best option to clip to copy a password of the best match [#4489]</li>
+                    <li>Browser: Add Microsoft Edge support on Linux [#7100]</li>
+                    <li>Browser: Support native password generator from the extension [#6529]</li>
+                    <li>Browser: Add group settings [#4180]</li>
+                    <li>Browser: Add feature to ignore entries for HTTP-Auth Logins [#5394]</li>
+                    <li>Browser: Support triggering Auto-Type from browser extension [#6272]</li>
+                    <li>Browser: Add delete-entry command to API [#6899]</li>
+                    <li>Browser: Add search 'by-path' url to API [#5535]</li>
+                    <li>Browser: search for entries by UUID to API [#4763]</li>
+                    <li>Browser: Support auto-download of favicon on entry addition [#7179]</li>
+                    <li>Auto-Type: Major improvements to Auto-Type [#5864][#7463][#7435][#7391][#7129][#6400][#6364][#6361][#5283]</li>
+                    <li>Auto-Type: Fix typing to virtual machines on Windows [#7366]</li>
+                    <li>Auto-Type: Re-implement X11 keysym emulation [#7098]</li>
+                    <li>Auto-Type: Support multiple Xkb layouts [#6247]</li>
+                    <li>Auto-Type: Abort keystroke if modifiers held on X11 [#6351][#6357]</li>
+                    <li>Auto-Type: Add TOTP option to entry level Auto-Type menu [#6675]</li>
+                    <li>FdoSecrets: Major Refactor and Code Consolidation [#5747][#5660][#7043][#6915]</li>
+                    <li>FdoSecrets: Implement unlock before search [#6943]</li>
+                    <li>Reports: Add browser statistics report [#7197]</li>
+                    <li>Port crypto backend to [Botan](https://github.com/randombit/botan) [#6209]</li>
+                    <li>Improve attachment handling and security [#6606][#5034][#7083]</li>
+                    <li>Allow selecting any open database in unlock dialog [#5427]</li>
+                    <li>KeeShare: Remove checking signed container and QuaZip dependency [#7223]</li>
+                    <li>Introduce security option to enable copy on double click (default off) [#6433]</li>
+                    <li>Add 'delete entry without confirm' functionality [#5812]</li>
+                    <li>Improve macOS and Windows platform integration [#5851]</li>
+                    <li>Lock only the current database by default [#6652]</li>
+                    <li>Show expired entries on DB unlock [#7290]</li>
+                    <li>Add countdown progress bar to TOTP preview [#6930]</li>
+                    <li>Enter favicon url directly on icons page [#6614]</li>
+                    <li>Set C++17 as standard in the build system [#7180]</li>
+                    <li>Internalize ykcore into code base [#6654]</li>
+                    <li>Transition to Visual Studio builds on Windows [#5874]</li>
+                    <li>Ability to delete entries from health check reports [#6537]</li>
+                    <li>Enhance remembering last-used directories [#6711]</li>
+                    <li>Implement org.freedesktop.appearance.color-scheme support on Linux [#7422]</li>
+                    <li>Support sorting HTML export [#7011]</li>
+                    <li>Add display number of characters in passphrases [#5449]</li>
+                    <li>Use Alt+Tab on macOS to switch between databases [#5407]</li>
+                    <li>Add feature to sort groups using shortcut keys [#6999]</li>
+                    <li>Add CTRL+Enter to apply password generator changes [#6414]</li>
+                    <li>Display `Database created` timestamp on statistics report [#6876]</li>
+                    <li>Browser: Improve best matching credentials setting [#6893]</li>
+                    <li>SSH Agent: Use both Pageant and OpenSSH agent simultaneously on Windows [#6288]</li>
+                    <li>SSH Agent: Allow using database path to resolve keys [#6365]</li>
+                    <li>SSH Agent: Show correct error messages in main window [#7166]</li>
+                    <li>Multiple fixes for MSI installer [#6630]</li>
+                    <li>Fix tab order for CSV import dialog to match screen order [#7315]</li>
+                    <li>Don't mark kdbx:// urls as invalid [#7221]</li>
+                    <li>Make selected text copyable instead of copying password [#7209]</li>
+                    <li>Detect timestamp resolution for CSV files [#7196]</li>
+                    <li>Fix crash while downloading favicon [#7104]</li>
+                    <li>Correct naming of newly generated keyx files [#7010]</li>
+                    <li>Place the 'Recycle Bin' at the bottom of the list when groups are sorted [#7004]</li>
+                    <li>Handle tilde with custom browser paths [#6659]</li>
+                    <li>Don't scroll up when deleting an entry [#6833]</li>
+                    <li>Set the MIME-Type to text/plain when using wl-copy on wayland [#6832]</li>
+                    <li>Fix adaptive icon painting [#5989][#6033]</li>
+                    <li>Fix favicon download from URL with non-standard port [#5509]</li>
+                    <li>Ignore recycle bin on KeePassHTTP migration [#5481]</li>
+                </ul>
+            </description>
+        </release>
        <release version="2.6.6" date="2021-06-11">
            <description>
                <ul>
--- a/share/translations/keepassxc_ar.ts
+++ b/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>
--- a/share/translations/keepassxc_bg.ts
+++ b/share/translations/keepassxc_bg.ts
--- a/share/translations/keepassxc_bn.ts
+++ b/share/translations/keepassxc_bn.ts
--- a/share/translations/keepassxc_bn_BD.ts
+++ b/share/translations/keepassxc_bn_BD.ts
--- a/share/translations/keepassxc_ca.ts
+++ b/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>
--- a/share/translations/keepassxc_cs.ts
+++ b/share/translations/keepassxc_cs.ts
--- a/share/translations/keepassxc_da.ts
+++ b/share/translations/keepassxc_da.ts
--- a/share/translations/keepassxc_de.ts
+++ b/share/translations/keepassxc_de.ts
--- a/share/translations/keepassxc_el.ts
+++ b/share/translations/keepassxc_el.ts
--- a/share/translations/keepassxc_en.ts
+++ b/share/translations/keepassxc_en.ts
@ -705,14 +705,6 @@
        <source>Double click a row to perform Auto-Type or find an entry using the search:</source>
        <translation type="unfinished"></translation>
    </message>
-    <message>
-        <source>&lt;p&gt;You can use advanced search queries to find any entry in your open databases. The following shortcuts are useful:&lt;br/&gt;
-Ctrl+F - Toggle database search&lt;br/&gt;
-Ctrl+1 - Type username&lt;br/&gt;
-Ctrl+2 - Type password&lt;br/&gt;
-Ctrl+3 - Type TOTP&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
    <message>
        <source>Search all open databases</source>
        <translation type="unfinished"></translation>
@ -753,6 +745,19 @@ Ctrl+3 - Type TOTP&lt;/p&gt;</source>
        <source>Copy TOTP</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>&lt;p&gt;You can use advanced search queries to find any entry in your open databases. The following shortcuts are useful:&lt;br/&gt;
+Ctrl+F - Toggle database search&lt;br/&gt;
+Ctrl+1 - Type username&lt;br/&gt;
+Ctrl+2 - Type password&lt;br/&gt;
+Ctrl+3 - Type TOTP&lt;br/&gt;
+Ctrl+4 - Use Virtual Keyboard (Windows Only)&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use Virtual Keyboard</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>BrowserAccessControlDialog</name>
--- a/share/translations/keepassxc_en_GB.ts
+++ b/share/translations/keepassxc_en_GB.ts
--- a/share/translations/keepassxc_en_US.ts
+++ b/share/translations/keepassxc_en_US.ts
--- a/share/translations/keepassxc_eo.ts
+++ b/share/translations/keepassxc_eo.ts
--- a/share/translations/keepassxc_es.ts
+++ b/share/translations/keepassxc_es.ts
--- a/share/translations/keepassxc_es_419.ts
+++ b/share/translations/keepassxc_es_419.ts
--- a/share/translations/keepassxc_et.ts
+++ b/share/translations/keepassxc_et.ts
--- a/share/translations/keepassxc_eu.ts
+++ b/share/translations/keepassxc_eu.ts
--- a/share/translations/keepassxc_fa.ts
+++ b/share/translations/keepassxc_fa.ts
--- a/share/translations/keepassxc_fi.ts
+++ b/share/translations/keepassxc_fi.ts
--- a/share/translations/keepassxc_fr.ts
+++ b/share/translations/keepassxc_fr.ts
--- a/share/translations/keepassxc_fr_CA.ts
+++ b/share/translations/keepassxc_fr_CA.ts
--- a/share/translations/keepassxc_gl.ts
+++ b/share/translations/keepassxc_gl.ts
--- a/share/translations/keepassxc_he.ts
+++ b/share/translations/keepassxc_he.ts
--- a/share/translations/keepassxc_hr_HR.ts
+++ b/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>
--- a/share/translations/keepassxc_hu.ts
+++ b/share/translations/keepassxc_hu.ts
--- a/share/translations/keepassxc_id.ts
+++ b/share/translations/keepassxc_id.ts
--- a/share/translations/keepassxc_is_IS.ts
+++ b/share/translations/keepassxc_is_IS.ts
--- a/share/translations/keepassxc_it.ts
+++ b/share/translations/keepassxc_it.ts
--- a/share/translations/keepassxc_ja.ts
+++ b/share/translations/keepassxc_ja.ts
--- a/share/translations/keepassxc_kk.ts
+++ b/share/translations/keepassxc_kk.ts
--- a/share/translations/keepassxc_ko.ts
+++ b/share/translations/keepassxc_ko.ts
--- a/share/translations/keepassxc_la.ts
+++ b/share/translations/keepassxc_la.ts
--- a/share/translations/keepassxc_lt.ts
+++ b/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>
--- a/share/translations/keepassxc_lv.ts
+++ b/share/translations/keepassxc_lv.ts
--- a/share/translations/keepassxc_ml.ts
+++ b/share/translations/keepassxc_ml.ts
--- a/share/translations/keepassxc_my.ts
+++ b/share/translations/keepassxc_my.ts
--- a/share/translations/keepassxc_nb.ts
+++ b/share/translations/keepassxc_nb.ts
--- a/share/translations/keepassxc_nl_BE.ts
+++ b/share/translations/keepassxc_nl_BE.ts
--- a/share/translations/keepassxc_nl_NL.ts
+++ b/share/translations/keepassxc_nl_NL.ts
--- a/share/translations/keepassxc_nn.ts
+++ b/share/translations/keepassxc_nn.ts
--- a/share/translations/keepassxc_pa.ts
+++ b/share/translations/keepassxc_pa.ts
--- a/share/translations/keepassxc_pl.ts
+++ b/share/translations/keepassxc_pl.ts
--- a/share/translations/keepassxc_pt_BR.ts
+++ b/share/translations/keepassxc_pt_BR.ts
--- a/share/translations/keepassxc_pt_PT.ts
+++ b/share/translations/keepassxc_pt_PT.ts
--- a/share/translations/keepassxc_ro.ts
+++ b/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>
@ -2493,6 +2497,14 @@ Unfortunately, any changes made have been lost.</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>
@ -3482,12 +3494,24 @@ Are you sure to add this file?</source>
        <translation>Are TOTP</translation>
    </message>
 </context>
+<context>
+    <name>FdoSecrets::Item</name>
+    <message>
+        <source>Entry &quot;%1&quot; from database &quot;%2&quot; was used by %3</source>
+        <translation>Intrarea „%1” din baza de date „%2” a fost utilizată de %3</translation>
+    </message>
+</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>
 </context>
 <context>
    <name>FdoSecrets::SettingsDatabaseModel</name>
@ -4341,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>
@ -4387,6 +4399,18 @@ Sigur doriți să continuați cu acest fișier?</translation>
        <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>
    <name>MainWindow</name>
@ -4814,10 +4838,6 @@ Asteptati-va unele bug-uri și probleme minore, această versiune nu este destin
        <source>Show Toolbar</source>
        <translation type="unfinished"/>
    </message>
-    <message>
-        <source>Show Groups Panel</source>
-        <translation type="unfinished"/>
-    </message>
    <message>
        <source>Show Preview Panel</source>
        <translation type="unfinished"/>
@ -5390,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>
@ -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>
@ -6763,6 +6783,22 @@ Please consider generating a new key file.</source>
        <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>
@ -7465,10 +7501,6 @@ Please consider generating a new key file.</source>
        <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>
@ -7536,10 +7568,6 @@ Please consider generating a new key file.</source>
        <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>
--- a/share/translations/keepassxc_ru.ts
+++ b/share/translations/keepassxc_ru.ts
--- a/share/translations/keepassxc_ru_UA.ts
+++ b/share/translations/keepassxc_ru_UA.ts
--- a/share/translations/keepassxc_si.ts
+++ b/share/translations/keepassxc_si.ts
--- a/share/translations/keepassxc_sk.ts
+++ b/share/translations/keepassxc_sk.ts
--- a/Show More
+++ b/Show More
				`@ -1 +0,0 @@`
				<?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-keyboard-variant" width="24" height="24" viewBox="0 0 24 24"><path d="M6,16H18V18H6V16M6,13V15H2V13H6M7,15V13H10V15H7M11,15V13H13V15H11M14,15V13H17V15H14M18,15V13H22V15H18M2,10H5V12H2V10M19,12V10H22V12H19M18,12H16V10H18V12M8,12H6V10H8V12M12,12H9V10H12V12M15,12H13V10H15V12M2,9V7H4V9H2M5,9V7H7V9H5M8,9V7H10V9H8M11,9V7H13V9H11M14,9V7H16V9H14M17,9V7H22V9H17Z" /></svg>