Release 2.5.4

Fixed - Return keyboard focus after saving database edits [#4287] - Windows: Use bare minimum settings in portable version [#4131] - Windows: Use SHA256 code signing [#4129] - macOS: Fix code signing incompatibility in latest macOS release [#4564]
2024-10-01 01:26:01 -04:00 · 2020-04-09 18:24:20 +02:00 · 2020-04-09 18:24:20 +02:00 · dcca5aa0f0
commit dcca5aa0f0
parent f8c962bd25 db2cfd424b
23 changed files with 961 additions and 998 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,14 @@
 # Changelog
 ## 2.5.4 (2020-04-09)
 ### Fixed
 - Return keyboard focus after saving database edits [#4287]
 - Windows: Use bare minimum settings in portable version [#4131]
 - Windows: Use SHA256 code signing [#4129]
 - macOS: Fix code signing incompatibility in latest macOS release [#4564] 
 ## 2.5.3 (2020-01-19)
 ### Fixed
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -95,7 +95,7 @@ endif()
 set(KEEPASSXC_VERSION_MAJOR "2")
 set(KEEPASSXC_VERSION_MINOR "5")
-set(KEEPASSXC_VERSION_PATCH "3")
+set(KEEPASSXC_VERSION_PATCH "4")
 set(KEEPASSXC_VERSION "${KEEPASSXC_VERSION_MAJOR}.${KEEPASSXC_VERSION_MINOR}.${KEEPASSXC_VERSION_PATCH}")
 set(OVERRIDE_VERSION "" CACHE STRING "Override the KeePassXC Version for Snapshot builds")
@ -334,12 +334,13 @@ if(MINGW)
    set(PLUGIN_INSTALL_DIR ".")
    set(DATA_INSTALL_DIR "share")
 elseif(APPLE AND WITH_APP_BUNDLE)
-    set(CMAKE_INSTALL_MANDIR "${PROGNAME}.app/Contents/Resources/man")
+    set(BUNDLE_INSTALL_DIR "${PROGNAME}.app/Contents")
-    set(CLI_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(CMAKE_INSTALL_MANDIR "${BUNDLE_INSTALL_DIR}/Resources/man")
-    set(PROXY_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(CLI_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
-    set(BIN_INSTALL_DIR "${PROGNAME}.app/Contents/MacOS")
+    set(PROXY_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
-    set(PLUGIN_INSTALL_DIR "${PROGNAME}.app/Contents/PlugIns")
+    set(BIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/MacOS")
-    set(DATA_INSTALL_DIR "${PROGNAME}.app/Contents/Resources")
+    set(PLUGIN_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/PlugIns")
    set(DATA_INSTALL_DIR "${BUNDLE_INSTALL_DIR}/Resources")
 else()
    include(GNUInstallDirs)
--- a/15
+++ b/15
@ -1200,9 +1200,14 @@ appsign() {
                    exitError "Unpacking failed!"
                fi
-                logInfo "Signing app..."
+                logInfo "Signing app bundle..."
-                xcrun codesign --sign "${key}" --verbose --deep --entitlements \
+                xcrun codesign --sign "${key}" --verbose --deep --options runtime ./app/KeePassXC.app
-                    "${real_src_dir}/share/macosx/keepassxc.entitlements" ./app/KeePassXC.app
+
                # Sign main binary and libraries independently so we can keep using the convenient --deep
                # option while avoiding adding entitlements recursively
                logInfo "Signing main binary..."
                xcrun codesign --sign "${key}" --verbose --force --options runtime --entitlements \
                    "${real_src_dir}/share/macosx/keepassxc.entitlements" ./app/KeePassXC.app/Contents/MacOS/KeePassXC
                if [ 0 -ne $? ]; then
                    cd "${orig_dir}"
@ -1286,8 +1291,8 @@ appsign() {
                # osslsigncode does not succeed at signing MSI files at this time...
                logInfo "Signing file '${f}' using Microsoft signtool..."
-                signtool sign -f "${key}" -p "${password}" -d "KeePassXC" \
+                signtool sign -f "${key}" -p "${password}" -d "KeePassXC" -td sha256 \
-                    -t "http://timestamp.comodoca.com/authenticode" "${f}"
+                    -fd sha256 -tr "http://timestamp.comodoca.com/authenticode" "${f}"
                if [ 0 -ne $? ]; then
                    exitError "Signing failed!"
--- a/share/keepassxc.ini
+++ b/share/keepassxc.ini
@ -1,62 +1,10 @@
-[General]
+[General]
-RememberLastDatabases=true
+UpdateCheckMessageShown=false
-RememberLastKeyFiles=true
+LastActiveDatabase=@Invalid()
-OpenPreviousDatabasesOnStartup=true
+LastOpenedDatabases=@Invalid()
-AutoSaveAfterEveryChange=false
+HideWindowOnCopy=false
-AutoSaveOnExit=false
+MinimizeOnCopy=true
-AutoReloadOnChange=true
+
-HideWindowOnCopy=false
+[GUI]
-MinimizeOnCopy=true
+HideUsernames=false
-DropToBackgroundOnCopy=false
+HidePasswords=true
 MinimizeOnOpenUrl=false
 UseGroupIconOnEntryCreation=true
 IgnoreGroupExpansion=false
 AutoTypeEntryTitleMatch=true
 GlobalAutoTypeKey=0
 GlobalAutoTypeModifiers=0
 LastOpenedDatabases=@Invalid()
 [GUI]
 Language=system
 ShowTrayIcon=false
 DarkTrayIcon=false
 MinimizeToTray=false
 MinimizeOnClose=false
 MinimizeOnStartup=false
 MonospaceNotes=false
 MainWindowGeometry="@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x2(\0\0\0\xbd\0\0\x5W\0\0\x3;\0\0\x2\x30\0\0\0\xdc\0\0\x5O\0\0\x3\x33\0\0\0\0\0\0\0\0\a\x80)"
 SplitterState=@Invalid()
 EntryListColumnSizes=@Invalid()
 EntrySearchColumnSizes=@Invalid()
 [security]
 autotypeask=true
 clearclipboard=true
 clearclipboardtimeout=10
 lockdatabaseidle=false
 lockdatabaseidlesec=240
 lockdatabaseminimize=false
 lockdatabasescreenlock=true
 passwordscleartext=false
 passwordemptynodots=true
 passwordsrepeat=false
 [Http]
 Enabled=false
 ShowNotification=true
 BestMatchOnly=false
 UnlockDatabase=true
 MatchUrlScheme=true
 SortByUsername=false
 Port=19455
 AlwaysAllowAccess=false
 AlwaysAllowUpdate=false
 SearchInAllDatabases=false
 SupportKphFields=true
 generator\LowerCase=true
 generator\UpperCase=true
 generator\Numbers=true
 generator\SpecialChars=false
 generator\ExcludeAlike=true
 generator\EnsureEvery=true
 generator\Length=16
--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@ -50,6 +50,16 @@
    </screenshots>
    <releases>
        <release version="2.5.4" date="2020-04-09">
            <description>
                <ul>
                    <li>Return keyboard focus after saving database edits [#4287]</li>
                    <li>Windows: Use bare minimum settings in portable version [#4131]</li>
                    <li>Windows: Use SHA256 code signing [#4129]</li>
                    <li>macOS: Fix code signing incompatibility in latest macOS release [#4564]</li>
                </ul>
            </description>
        </release>
        <release version="2.5.3" date="2020-01-19">
            <description>
                <ul>
--- a/share/macosx/Info.plist.cmake
+++ b/share/macosx/Info.plist.cmake
@ -15,7 +15,7 @@
  <key>CFBundleIconFile</key>
  <string>keepassxc.icns</string>
  <key>CFBundleIdentifier</key>
-  <string>org.keepassx.keepassxc</string>
+  <string>org.keepassxc.keepassxc</string>
  <key>CFBundleInfoDictionaryVersion</key>
  <string>6.0</string>
  <key>CFBundleName</key>
@ -25,11 +25,11 @@
  <key>CFBundleShortVersionString</key>
  <string>${KEEPASSXC_VERSION}</string>
  <key>CFBundleSignature</key>
-  <string>KEPX</string>
+  <string>KPXC</string>
  <key>CFBundleVersion</key>
  <string>${KEEPASSXC_VERSION_NUM}</string>
  <key>NSHumanReadableCopyright</key>
-    <string>Copyright 2016-2018 KeePassXC Development Team</string>
+    <string>Copyright 2016-2020 KeePassXC Development Team</string>
    <key>CFBundleDocumentTypes</key>
    <array>
      <dict>
--- a/share/macosx/embedded.provisionprofile
+++ b/share/macosx/embedded.provisionprofile
--- a/share/macosx/keepassxc.entitlements
+++ b/share/macosx/keepassxc.entitlements
@ -1,33 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
-	<dict>
+<dict>
-		<key>com.apple.application-identifier</key>
+	<key>com.apple.application-identifier</key>
-			<string>org.keepassx.keepassxc</string>
+	<string>G2S7P7J672.org.keepassxc.keepassxc</string>
-		<key>com.apple.developer.aps-environment</key>
+	<key>keychain-access-groups</key>
-			<string>production</string>
+	<array>
-
+		<string>G2S7P7J672.org.keepassxc.keepassxc</string>
-		<key>keychain-access-groups</key>
+	</array>
-			<array>
+</dict>
 				<string>org.keepassx.keepassxc</string>
 			</array>
 		<!-- Sandbox entitlements stub for future reference.
 		     For whatever reason, we have to set this twice.
 		     Otherwise a signed application crashes on startup -->
 		<key>com.apple.security.app-sandbox</key>
 			<false/>
 		<key>com.apple.security.app-sandbox</key>
 			<false/>
 		<!--key>com.apple.security.network.client</key>
 			<true/>
 		<key>com.apple.security.files.user-selected.read-write</key>
 			<true/>
 		<key>com.apple.security.device.usb</key>
 			<true/>
 		<key>com.apple.security.print</key>
 			<true/>
 		<key>com.apple.security.files.user-selected.read-only</key>
 			<false/-->
 	</dict>
 </plist>
--- a/share/translations/keepassx_ca.ts
+++ b/share/translations/keepassx_ca.ts
@ -1599,11 +1599,11 @@ If you keep this number, your database may be too easy to crack!</source>
    </message>
    <message>
        <source>Max. history items:</source>
-        <translation>N. max. d&apos;elements al historial:</translation>
+        <translation>Nombre màxim d&apos;elements a l&apos;historial:</translation>
    </message>
    <message>
        <source>Max. history size:</source>
-        <translation>Mida màx. del historial:</translation>
+        <translation>Mida màxima de l&apos;historial:</translation>
    </message>
    <message>
        <source> MiB</source>
@ -4351,7 +4351,7 @@ Are you sure you want to continue with this file?</source>
    </message>
    <message>
        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exporta a fitxer CSV.</translation>
+        <translation>&amp;Exporta a un fitxer CSV...</translation>
    </message>
    <message>
        <source>Set up TOTP...</source>
@ -4534,7 +4534,7 @@ Podeu esperar alguns errors i incidències menors. Aquesta versió no està pens
    </message>
    <message>
        <source>Downlo&amp;ad all favicons</source>
-        <translation type="unfinished"/>
+        <translation>Descarreg&amp;a tots els favicons</translation>
    </message>
    <message>
        <source>Sort &amp;A-Z</source>
@ -5436,7 +5436,7 @@ Available commands:
    </message>
    <message>
        <source>Search term.</source>
-        <translation type="unfinished"/>
+        <translation>Terme de cerca.</translation>
    </message>
    <message>
        <source>Merge two databases.</source>
@ -6103,7 +6103,7 @@ Nucli: %3 %4</translation>
    </message>
    <message>
        <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation>Format a utilitzar en l&apos;exportació. Les opcions disponibles són XML o CSV. Per defect s&apos;usa XML.</translation>
+        <translation>Format a utilitzar en l&apos;exportació. Les opcions disponibles són XML o CSV. Per defecte s&apos;usa XML.</translation>
    </message>
    <message>
        <source>Exports the content of a database to standard output in the specified format.</source>
@ -6423,7 +6423,7 @@ Nucli: %3 %4</translation>
    <message>
        <source>Search (%1)...</source>
        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
-        <translation type="unfinished"/>
+        <translation>Cerca (%1)...</translation>
    </message>
    <message>
        <source>Case sensitive</source>
@ -6858,7 +6858,7 @@ Nucli: %3 %4</translation>
    </message>
    <message numerus="yes">
        <source>Expires in &lt;b&gt;%n&lt;/b&gt; second(s)</source>
-        <translation><numerusform>Caduca en &lt;b&gt;% n&lt;/b&gt; segon (s)</numerusform><numerusform>Caduca en &lt;b&gt;% n&lt;/b&gt; segon(s)</numerusform></translation>
+        <translation><numerusform>Caduca en &lt;b&gt;%n&lt;/b&gt; segon</numerusform><numerusform>Caduca en &lt;b&gt;%n&lt;/b&gt; segons</numerusform></translation>
    </message>
 </context>
 <context>
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
--- a/share/translations/keepassx_es.ts
+++ b/share/translations/keepassx_es.ts
--- a/share/translations/keepassx_et.ts
+++ b/share/translations/keepassx_et.ts
@ -11,7 +11,7 @@
    </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 type="unfinished"/>
+        <translation>Vigadest teatamise koht: &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>
@ -116,7 +116,7 @@
    </message>
    <message>
        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
+        <translation>Avada saab ainult ühe KeePassXC protsessi</translation>
    </message>
    <message>
        <source>Minimize window at application startup</source>
@ -144,11 +144,11 @@
    </message>
    <message>
        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation type="unfinished"/>
+        <translation>Andmeid mittepuudutavaid muudatusi (nt gruppide laiendamist) ei loeta andmebaasi muutmiseks</translation>
    </message>
    <message>
        <source>Automatically reload the database when modified externally</source>
-        <translation type="unfinished"/>
+        <translation>Andmebaas laaditakse automaatselt uuesti, kui seda väljastpoolt (nt teise programmiga) muudetakse</translation>
    </message>
    <message>
        <source>Entry Management</source>
@ -418,7 +418,7 @@
    <name>AutoType</name>
    <message>
        <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation type="unfinished"/>
+        <translation>Sellisele aknatiitlile vastavat automaatsisestuse kirjet ei leitud:</translation>
    </message>
    <message>
        <source>Auto-Type - KeePassXC</source>
@ -619,11 +619,11 @@ Vali, millisesse neist tunnused salvestada tuleks.</translation>
    </message>
    <message>
        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation type="unfinished"/>
+        <translation>Kui an&amp;dmebaas on lukus, küsitakse luku avamist</translation>
    </message>
    <message>
        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
-        <translation>Kui see ruut on märgitud, tagastatakse ainult kirjed, mille URL-il on sama skeem (http, https vms) nagu aktiivsel veebilehel.</translation>
+        <translation>Kui see ruut on märgitud, tagastatakse ainult kirjed, mille URL-il on sama skeem (http, https, ...) nagu aktiivsel veebilehel.</translation>
    </message>
    <message>
        <source>&amp;Match URL scheme (e.g., https://...)</source>
@ -631,11 +631,11 @@ Vali, millisesse neist tunnused salvestada tuleks.</translation>
    </message>
    <message>
        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel tagastatakse ainult konkreetse URL-i kohta käivad vasted, mitte kõik kirjed, mille URL-i domeeniosa klapib.</translation>
    </message>
    <message>
        <source>&amp;Return only best-matching credentials</source>
-        <translation type="unfinished"/>
+        <translation>Tagastatakse vaid kõige paremini &amp;sobivad tunnused</translation>
    </message>
    <message>
        <source>Sort &amp;matching credentials by title</source>
@ -672,15 +672,15 @@ Vali, millisesse neist tunnused salvestada tuleks.</translation>
    </message>
    <message>
        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation type="unfinished"/>
+        <translation>Tagastatakse ka lisa&amp;stringiväljad, mille alguses on &quot;KPH: &quot;</translation>
    </message>
    <message>
        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel uuendatakse käivitusel programmiomase teatevahetuse skriptides automaatselt KeePassXC või keepassxc-proxy binaarfaili asukohta.</translation>
    </message>
    <message>
        <source>Update &amp;native messaging manifest files at startup</source>
-        <translation type="unfinished"/>
+        <translation>Käivitusel uuendatakse programmiomase teatevahetuse &amp;manifestifaile</translation>
    </message>
    <message>
        <source>Support a proxy application between KeePassXC and browser extension.</source>
@ -1449,7 +1449,7 @@ This is necessary to maintain compatibility with the browser plugin.</source>
    </message>
    <message>
        <source>Higher values offer more protection, but opening the database will take longer.</source>
-        <translation type="unfinished"/>
+        <translation>Mida suurem väärtus, seda kaitstum on andmebaas, kuid seda kauem võtab ka selle avamine.</translation>
    </message>
    <message>
        <source>Database format:</source>
@ -1675,7 +1675,7 @@ Seda toimingut ei saa tagasi võtta.</translation>
    </message>
    <message>
        <source>Breadcrumb</source>
-        <translation type="unfinished"/>
+        <translation>Jälglink</translation>
    </message>
    <message>
        <source>Type</source>
@ -1721,7 +1721,9 @@ Seda toimingut ei saa tagasi võtta.</translation>
        <source>WARNING! You have not set a password. Using a database without a password is strongly discouraged!
 Are you sure you want to continue without a password?</source>
-        <translation type="unfinished"/>
+        <translation>HOIATUS! Sa ei määranud parooli. Andmebaasi kasutamine ilma paroolita on äärmiselt ebasoovitatav!
 Kas oled kindel, et soovid jätkata ilma paroolita?</translation>
    </message>
    <message>
        <source>Unknown error</source>
@ -2017,7 +2019,7 @@ This is definitely a bug, please report it to the developers.</source>
    </message>
    <message>
        <source>No Results</source>
-        <translation type="unfinished"/>
+        <translation>Tulemusi pole</translation>
    </message>
    <message>
        <source>File has changed</source>
@ -2436,7 +2438,7 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>Skip Auto-Submit for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Automaatsaatmine jäetakse selle kirje puhul vahele</translation>
    </message>
    <message>
        <source>Hide this entry from the browser extension</source>
@ -2752,11 +2754,11 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>KeeShare unsigned container</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare&apos;i allkirjastamata ümbrik</translation>
    </message>
    <message>
        <source>KeeShare signed container</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare&apos;i allkirjastatud ümbrik</translation>
    </message>
    <message>
        <source>Select import source</source>
@ -2768,7 +2770,7 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>Select import/export file</source>
-        <translation type="unfinished"/>
+        <translation>Imporditava/eksporditava faili valimine</translation>
    </message>
    <message>
        <source>Clear</source>
@ -2964,7 +2966,7 @@ Supported extensions are: %1.</source>
    </message>
    <message numerus="yes">
        <source>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>See ikoon on kasutusel %n kirjes, kus see asendataks vaikeikooniga. Kas oled kindel, et soovid selle ikooni kustutada?</numerusform><numerusform>See ikoon on kasutusel %n kirjes, kus see asendataks vaikeikooniga. Kas oled kindel, et soovid selle ikooni kustutada?</numerusform></translation>
    </message>
    <message>
        <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
@ -2976,7 +2978,7 @@ Supported extensions are: %1.</source>
    </message>
    <message>
        <source>Apply selected icon to subgroups and entries</source>
-        <translation type="unfinished"/>
+        <translation>Vali, kas rakendada valitud ikoon ainult grupile endale või ka selle alamkirjetele</translation>
    </message>
    <message>
        <source>Apply icon &amp;to ...</source>
@ -2984,19 +2986,19 @@ Supported extensions are: %1.</source>
    </message>
    <message>
        <source>Apply to this only</source>
-        <translation type="unfinished"/>
+        <translation>Rakendatakse ainult grupile endale</translation>
    </message>
    <message>
        <source>Also apply to child groups</source>
-        <translation type="unfinished"/>
+        <translation>Rakendatakse ka alamgruppidele</translation>
    </message>
    <message>
        <source>Also apply to child entries</source>
-        <translation type="unfinished"/>
+        <translation>Rakendatakse ka alamkirjetele</translation>
    </message>
    <message>
        <source>Also apply to all children</source>
-        <translation type="unfinished"/>
+        <translation>Rakendatakse ka alamgruppidele ja nende kirjetele</translation>
    </message>
    <message>
        <source>Existing icon selected.</source>
@ -3117,7 +3119,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>Kas oled kindel, et soovid eemaldada %n manuse?</numerusform><numerusform>Kas oled kindel, et soovid eemaldada %n manust?</numerusform></translation>
    </message>
    <message>
        <source>Save attachments</source>
@ -3130,7 +3132,7 @@ This may cause the affected plugins to malfunction.</source>
    </message>
    <message>
        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
-        <translation type="unfinished"/>
+        <translation>Kas oled kindel, et soovid juba olemasoleva faili &quot;%1&quot; selle manusega üle kirjutada?</translation>
    </message>
    <message>
        <source>Confirm overwrite</source>
@ -4121,7 +4123,7 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
    <name>KeyComponentWidget</name>
    <message>
        <source>Key Component</source>
-        <translation type="unfinished"/>
+        <translation>Võtmekomponent</translation>
    </message>
    <message>
        <source>Key Component Description</source>
@ -4133,22 +4135,22 @@ Kui probleem püsib, võib andmebaasifail olla rikutud.</translation>
    </message>
    <message>
        <source>Key Component set, click to change or remove</source>
-        <translation type="unfinished"/>
+        <translation>Võtmekomponent on määratud, muutmiseks või eemaldamiseks klõpsa vastavat nuppu</translation>
    </message>
    <message>
        <source>Add %1</source>
        <comment>Add a key component</comment>
-        <translation type="unfinished"/>
+        <translation>Lisa: %1</translation>
    </message>
    <message>
        <source>Change %1</source>
        <comment>Change a key component</comment>
-        <translation type="unfinished"/>
+        <translation>Muuda: %1</translation>
    </message>
    <message>
        <source>Remove %1</source>
        <comment>Remove a key component</comment>
-        <translation type="unfinished"/>
+        <translation>Eemalda: %1</translation>
    </message>
    <message>
        <source>%1 set, click to change or remove</source>
@ -5156,7 +5158,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Regenerate</source>
-        <translation>Genereeri uuesti</translation>
+        <translation>Genereeri uus</translation>
    </message>
    <message>
        <source>Generated password</source>
@ -5196,7 +5198,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Word Case:</source>
-        <translation type="unfinished"/>
+        <translation>Täheregister:</translation>
    </message>
    <message>
        <source>Regenerate password</source>
@ -5208,7 +5210,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Accept password</source>
-        <translation type="unfinished"/>
+        <translation>Kasuta seda parooli</translation>
    </message>
    <message>
        <source>lower case</source>
@ -5242,7 +5244,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    <name>QMessageBox</name>
    <message>
        <source>Overwrite</source>
-        <translation type="unfinished"/>
+        <translation>Kirjuta üle</translation>
    </message>
    <message>
        <source>Delete</source>
@ -5250,7 +5252,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Move</source>
-        <translation type="unfinished"/>
+        <translation>Viska</translation>
    </message>
    <message>
        <source>Empty</source>
@ -5976,11 +5978,11 @@ Võimalikud käsud:
    </message>
    <message>
        <source>Version %1</source>
-        <translation>Versioon %1</translation>
+        <translation>versioon %1</translation>
    </message>
    <message>
        <source>Build Type: %1</source>
-        <translation type="unfinished"/>
+        <translation>Järgu tüüp: %1</translation>
    </message>
    <message>
        <source>Revision: %1</source>
@ -6012,15 +6014,15 @@ Kernel: %3 %4</translation>
    </message>
    <message>
        <source>KeeShare (signed and unsigned sharing)</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare (allkirjastatud ja allkirjastamata)</translation>
    </message>
    <message>
        <source>KeeShare (only signed sharing)</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare (ainult allkirjastatud)</translation>
    </message>
    <message>
        <source>KeeShare (only unsigned sharing)</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare (ainult allkirjastamata)</translation>
    </message>
    <message>
        <source>YubiKey</source>
@ -6032,7 +6034,7 @@ Kernel: %3 %4</translation>
    </message>
    <message>
        <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Puudub</translation>
    </message>
    <message>
        <source>Enabled extensions:</source>
@ -6368,7 +6370,7 @@ Kernel: %3 %4</translation>
    </message>
    <message>
        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
-        <translation type="unfinished"/>
+        <translation>Otsingusõnade süntaks on järgmine: [modifikaatorid][väli:][&quot;]otsitav[&quot;]</translation>
    </message>
    <message>
        <source>Every search term must match (ie, logical AND)</source>
@ -6519,7 +6521,7 @@ Kernel: %3 %4</translation>
    </message>
    <message>
        <source>Lock database</source>
-        <translation type="unfinished"/>
+        <translation>Lukusta andmebaas</translation>
    </message>
    <message>
        <source>Unlock to show</source>
@ -6527,14 +6529,14 @@ Kernel: %3 %4</translation>
    </message>
    <message>
        <source>None</source>
-        <translation type="unfinished"/>
+        <translation>Puudub</translation>
    </message>
 </context>
 <context>
    <name>SettingsWidgetKeeShare</name>
    <message>
        <source>Active</source>
-        <translation type="unfinished"/>
+        <translation>Aktiveerimine</translation>
    </message>
    <message>
        <source>Allow export</source>
@ -6655,15 +6657,15 @@ Kernel: %3 %4</translation>
    </message>
    <message>
        <source>Allow KeeShare imports</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel lubatakse KeeShare&apos;i importimine</translation>
    </message>
    <message>
        <source>Allow KeeShare exports</source>
-        <translation type="unfinished"/>
+        <translation>Märkimisel lubatakse KeeShare&apos;i eksportimine</translation>
    </message>
    <message>
        <source>Only show warnings and errors</source>
-        <translation type="unfinished"/>
+        <translation>Kuvatakse ainult hoiatused ja veateated</translation>
    </message>
    <message>
        <source>Key</source>
--- a/share/translations/keepassx_id.ts
+++ b/share/translations/keepassx_id.ts
@ -4656,11 +4656,11 @@ Jangan kaget jika ada masalah dan bug, versi ini tidak ditujukan untuk penggunaa
    </message>
    <message>
        <source>Synchronizing from newer source %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Menyinkronkan dengan sumber yang lebih baru %1 [%2]</translation>
    </message>
    <message>
        <source>Synchronizing from older source %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Menyinkronkan dengan sumber yang lebih lama %1 [%2]</translation>
    </message>
    <message>
        <source>Deleting child %1 [%2]</source>
--- a/share/translations/keepassx_nb.ts
+++ b/share/translations/keepassx_nb.ts
@ -225,27 +225,27 @@
    </message>
    <message>
        <source>Remember previously used databases</source>
-        <translation type="unfinished"/>
+        <translation>Husk tidligere brukte databaser</translation>
    </message>
    <message>
        <source>Load previously open databases on startup</source>
-        <translation type="unfinished"/>
+        <translation>Last tidligere åpne databaser ved oppstart</translation>
    </message>
    <message>
        <source>Remember database key files and security dongles</source>
-        <translation type="unfinished"/>
+        <translation>Husk database nøkkelfiler og sikkerhetsdongler</translation>
    </message>
    <message>
        <source>Check for updates at application startup once per week</source>
-        <translation type="unfinished"/>
+        <translation>Se etter oppdateringer ved oppstart av applikasjonen en gang per uke</translation>
    </message>
    <message>
        <source>Include beta releases when checking for updates</source>
-        <translation type="unfinished"/>
+        <translation>Ta med betaversjoner når du ser etter oppdateringer</translation>
    </message>
    <message>
        <source>Button style:</source>
-        <translation type="unfinished"/>
+        <translation>Knappestil:</translation>
    </message>
    <message>
        <source>Language:</source>
@ -253,19 +253,19 @@
    </message>
    <message>
        <source>(restart program to activate)</source>
-        <translation type="unfinished"/>
+        <translation>(start programmet på nytt for å aktivere)</translation>
    </message>
    <message>
        <source>Minimize window after unlocking database</source>
-        <translation type="unfinished"/>
+        <translation>Minimer vinduet etter at du har låst opp database</translation>
    </message>
    <message>
        <source>Minimize when opening a URL</source>
-        <translation type="unfinished"/>
+        <translation>Minimer når du åpner en URL</translation>
    </message>
    <message>
        <source>Hide window when copying to clipboard</source>
-        <translation type="unfinished"/>
+        <translation>Skjul vindu når du kopierer til utklippstavle</translation>
    </message>
    <message>
        <source>Minimize</source>
@ -273,7 +273,7 @@
    </message>
    <message>
        <source>Drop to background</source>
-        <translation type="unfinished"/>
+        <translation>Slipp til bakgrunnen</translation>
    </message>
    <message>
        <source>Favicon download timeout:</source>
@ -302,7 +302,7 @@
    </message>
    <message>
        <source>Reset Settings to Default</source>
-        <translation type="unfinished"/>
+        <translation>Tilbakestill innstillinger til standard</translation>
    </message>
    <message>
        <source>Global auto-type shortcut</source>
@ -390,7 +390,7 @@
    </message>
    <message>
        <source>Use DuckDuckGo service to download website icons</source>
-        <translation type="unfinished"/>
+        <translation>Bruk DuckDuckGo-tjenesten for å laste ned nettstedikoner</translation>
    </message>
    <message>
        <source>Clipboard clear seconds</source>
@ -554,7 +554,7 @@ Velg om du vil gi tilgang eller ikke.</translation>
    </message>
    <message>
        <source>Deny access</source>
-        <translation type="unfinished"/>
+        <translation>Nekte adgang</translation>
    </message>
 </context>
 <context>
@ -755,7 +755,7 @@ Vennligst velg riktig database for å lagre legitimasjon.</translation>
    </message>
    <message>
        <source>Enable browser integration</source>
-        <translation type="unfinished"/>
+        <translation>Aktiver nettleser integrasjon</translation>
    </message>
    <message>
        <source>Browsers installed as snaps are currently not supported.</source>
@ -837,11 +837,11 @@ Moved %2 keys to custom data.</source>
    </message>
    <message>
        <source>KeePassXC: No entry with KeePassHTTP attributes found!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: Ingen oppføringer med KeePassHTTP-attributter funnet!</translation>
    </message>
    <message>
        <source>The active database does not contain an entry with KeePassHTTP attributes.</source>
-        <translation type="unfinished"/>
+        <translation>Den aktiv database inneholder ikke en oppføring med KeePassHTTP-attributter.</translation>
    </message>
    <message>
        <source>KeePassXC: Legacy browser integration settings detected</source>
@ -1116,7 +1116,7 @@ Vurder å opprette en ny nøkkelfil.</translation>
    </message>
    <message>
        <source>Failed to open key file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Kunne ikke åpne nøkkelfil: %1</translation>
    </message>
    <message>
        <source>Select slot...</source>
@ -1160,7 +1160,7 @@ Vurder å opprette en ny nøkkelfil.</translation>
    </message>
    <message>
        <source>Hardware Key:</source>
-        <translation type="unfinished"/>
+        <translation>Maskinvarenøkkel:</translation>
    </message>
    <message>
        <source>Hardware key help</source>
@ -1176,7 +1176,7 @@ Vurder å opprette en ny nøkkelfil.</translation>
    </message>
    <message>
        <source>Clear Key File</source>
-        <translation type="unfinished"/>
+        <translation>Tøm nøkkelfil</translation>
    </message>
    <message>
        <source>Unlock failed and no password given</source>
@ -1212,15 +1212,15 @@ 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>Select key file...</source>
-        <translation type="unfinished"/>
+        <translation>Velge nøkkelfil...</translation>
    </message>
    <message>
        <source>Cannot use database file as key file</source>
-        <translation type="unfinished"/>
+        <translation>Kan ikke bruke database fil som nøkkelfil</translation>
    </message>
    <message>
        <source>You cannot use your database file as a key file.
@ -1532,7 +1532,7 @@ Dersom du beholder dette antallet så kan databasen være for lett å knekke!</t
    </message>
    <message>
        <source>Decryption time in seconds</source>
-        <translation type="unfinished"/>
+        <translation>Dekrypteringstid i sekunder</translation>
    </message>
    <message>
        <source>Database format</source>
@ -1540,7 +1540,7 @@ Dersom du beholder dette antallet så kan databasen være for lett å knekke!</t
    </message>
    <message>
        <source>Encryption algorithm</source>
-        <translation type="unfinished"/>
+        <translation>Kryptering algoritme</translation>
    </message>
    <message>
        <source>Key derivation function</source>
@ -1552,7 +1552,7 @@ Dersom du beholder dette antallet så kan databasen være for lett å knekke!</t
    </message>
    <message>
        <source>Memory usage</source>
-        <translation type="unfinished"/>
+        <translation>Minnebruk</translation>
    </message>
    <message>
        <source>Parallelism</source>
@ -1646,7 +1646,7 @@ Dersom du beholder dette antallet så kan databasen være for lett å knekke!</t
    </message>
    <message>
        <source>Delete Recycle Bin</source>
-        <translation type="unfinished"/>
+        <translation>Slett søppelbøtte</translation>
    </message>
    <message>
        <source>Do you want to delete the current recycle bin and all its contents?
@ -1655,7 +1655,7 @@ This action is not reversible.</source>
    </message>
    <message>
        <source> (old)</source>
-        <translation type="unfinished"/>
+        <translation>(gammel)</translation>
    </message>
 </context>
 <context>
@ -1752,7 +1752,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    <name>DatabaseSettingsWidgetStatistics</name>
    <message>
        <source>Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Statistikk</translation>
    </message>
    <message>
        <source>Hover over lines with error icons for further information.</source>
@ -1768,11 +1768,11 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>Database name</source>
-        <translation type="unfinished"/>
+        <translation>Database navn</translation>
    </message>
    <message>
        <source>Description</source>
-        <translation type="unfinished"/>
+        <translation>Beskrivelse</translation>
    </message>
    <message>
        <source>Location</source>
@ -1780,7 +1780,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>Last saved</source>
-        <translation type="unfinished"/>
+        <translation>Sist lagret</translation>
    </message>
    <message>
        <source>Unsaved changes</source>
@ -1788,11 +1788,11 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>yes</source>
-        <translation type="unfinished"/>
+        <translation>ja</translation>
    </message>
    <message>
        <source>no</source>
-        <translation type="unfinished"/>
+        <translation>nei</translation>
    </message>
    <message>
        <source>The database was modified, but the changes have not yet been saved to disk.</source>
@ -1816,7 +1816,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>Unique passwords</source>
-        <translation type="unfinished"/>
+        <translation>Unike passord</translation>
    </message>
    <message>
        <source>Non-unique passwords</source>
@ -1824,7 +1824,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>More than 10% of passwords are reused. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Mer enn 10% av passordene brukes på nytt. Bruk unike passord når det er mulig.</translation>
    </message>
    <message>
        <source>Maximum password reuse</source>
@ -1832,7 +1832,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>Some passwords are used more than three times. Use unique passwords when possible.</source>
-        <translation type="unfinished"/>
+        <translation>Noen passord brukes mer enn tre ganger. Bruk unike passord når det er mulig.</translation>
    </message>
    <message>
        <source>Number of short passwords</source>
@ -1848,7 +1848,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>Recommend using long, randomized passwords with a rating of &apos;good&apos; or &apos;excellent&apos;.</source>
-        <translation type="unfinished"/>
+        <translation>Anbefaler å bruke lange, tilfeldige passord med en vurdering av &apos;bra&apos; eller &apos;utmerket&apos;.</translation>
    </message>
    <message>
        <source>Average password length</source>
@ -1864,7 +1864,7 @@ Er du sikker på at du vil fortsette uten passord?</translation>
    </message>
    <message>
        <source>Please wait, database statistics are being calculated...</source>
-        <translation type="unfinished"/>
+        <translation>Vent, database statistikk blir beregnet...</translation>
    </message>
 </context>
 <context>
@ -1936,19 +1936,19 @@ Dette er definitivt en feil, rapporter det til utviklerne.</translation>
    <message>
        <source>%1 [Read-only]</source>
        <comment>Database tab name modifier</comment>
-        <translation type="unfinished"/>
+        <translation>%1 [Skrivebeskyttet]</translation>
    </message>
    <message>
        <source>Failed to open %1. It either does not exist or is not accessible.</source>
-        <translation type="unfinished"/>
+        <translation>Kunne ikke åpne %1. Enten eksisterer den ikke eller er ikke tilgjengelig.</translation>
    </message>
    <message>
        <source>Export database to HTML file</source>
-        <translation type="unfinished"/>
+        <translation>Eksporter database til HTML-fil</translation>
    </message>
    <message>
        <source>HTML file</source>
-        <translation type="unfinished"/>
+        <translation>HTML-fil</translation>
    </message>
    <message>
        <source>Writing the HTML file failed.</source>
@ -2267,11 +2267,11 @@ Deaktivere sikker lagring og prøve igjen?</translation>
    </message>
    <message>
        <source>&lt;empty URL&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;empty URL&gt;</translation>
    </message>
    <message>
        <source>Are you sure you want to remove this URL?</source>
-        <translation type="unfinished"/>
+        <translation>Er du sikker på at du vil fjerne denne URL-en?</translation>
    </message>
 </context>
 <context>
@ -2452,7 +2452,7 @@ Deaktivere sikker lagring og prøve igjen?</translation>
    </message>
    <message>
        <source>Edit</source>
-        <translation type="unfinished"/>
+        <translation>Endring</translation>
    </message>
 </context>
 <context>
@ -2964,7 +2964,7 @@ Supported extensions are: %1.</source>
    </message>
    <message>
        <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
-        <translation type="unfinished"/>
+        <translation>Du kan aktivere DuckDuckGo-ikonetjenesten under Verktøy -&gt; Innstillinger -&gt; Sikkerhet</translation>
    </message>
    <message>
        <source>Download favicon for URL</source>
@ -3057,7 +3057,7 @@ Dette kan føre til feil for de berørte programtilleggene.</translation>
    </message>
    <message>
        <source>Unique ID</source>
-        <translation type="unfinished"/>
+        <translation>Unik ID</translation>
    </message>
    <message>
        <source>Plugin data</source>
@ -3477,7 +3477,7 @@ You can enable the DuckDuckGo website icon service in the security section of th
    </message>
    <message>
        <source>Downloading...</source>
-        <translation type="unfinished"/>
+        <translation>Laster ned...</translation>
    </message>
    <message>
        <source>Ok</source>
@ -4102,15 +4102,15 @@ If this reoccurs, then your database file may be corrupt.</source>
    </message>
    <message>
        <source>Imported from</source>
-        <translation type="unfinished"/>
+        <translation>Importert fra</translation>
    </message>
    <message>
        <source>Exported to</source>
-        <translation type="unfinished"/>
+        <translation>Eksportert til</translation>
    </message>
    <message>
        <source>Synchronized with</source>
-        <translation type="unfinished"/>
+        <translation>Synkronisert med</translation>
    </message>
 </context>
 <context>
@ -4228,7 +4228,7 @@ Message: %2</source>
    </message>
    <message>
        <source>Invalid Key File</source>
-        <translation type="unfinished"/>
+        <translation>Ugyldig nøkkelfil</translation>
    </message>
    <message>
        <source>You cannot use the current database as its own keyfile. Please choose a different file or generate a new key file.</source>
@ -4236,7 +4236,7 @@ Message: %2</source>
    </message>
    <message>
        <source>Suspicious Key File</source>
-        <translation type="unfinished"/>
+        <translation>Mistenkelig nøkkelfil</translation>
    </message>
    <message>
        <source>The chosen key file looks like a password database file. A key file must be a static file that never changes or you will lose access to your database forever.
@ -4466,7 +4466,7 @@ Vi anbefaler at du bruker det AppImage som er tilgjengelig på nedlastingssiden.
    </message>
    <message>
        <source>&amp;New group</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ny gruppe</translation>
    </message>
    <message>
        <source>Add a new group</source>
@ -4539,7 +4539,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>&amp;Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Se etter oppdateringer...</translation>
    </message>
    <message>
        <source>Downlo&amp;ad all favicons</source>
@ -4567,7 +4567,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>1Password Vault...</source>
-        <translation type="unfinished"/>
+        <translation>1Password Hvelv...</translation>
    </message>
    <message>
        <source>Import a 1Password Vault</source>
@ -4701,7 +4701,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Simple Settings</source>
-        <translation type="unfinished"/>
+        <translation>Enkle innstillinger</translation>
    </message>
 </context>
 <context>
@ -5133,7 +5133,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Do not include:</source>
-        <translation type="unfinished"/>
+        <translation>Ikke ta med:</translation>
    </message>
    <message>
        <source>Add non-hex letters to &quot;do not include&quot; list</source>
@ -5157,7 +5157,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Generated password</source>
-        <translation type="unfinished"/>
+        <translation>Generert passord</translation>
    </message>
    <message>
        <source>Upper-case letters</source>
@ -5189,7 +5189,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Password length</source>
-        <translation type="unfinished"/>
+        <translation>Passord lengde</translation>
    </message>
    <message>
        <source>Word Case:</source>
@ -5201,11 +5201,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Copy password</source>
-        <translation type="unfinished"/>
+        <translation>Kopier passord</translation>
    </message>
    <message>
        <source>Accept password</source>
-        <translation type="unfinished"/>
+        <translation>Godta passord</translation>
    </message>
    <message>
        <source>lower case</source>
@ -5232,7 +5232,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Statistics</source>
-        <translation type="unfinished"/>
+        <translation>Statistikk</translation>
    </message>
 </context>
 <context>
@ -5251,7 +5251,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Empty</source>
-        <translation type="unfinished"/>
+        <translation>Tom</translation>
    </message>
    <message>
        <source>Remove</source>
@ -5271,7 +5271,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Continue</source>
-        <translation type="unfinished"/>
+        <translation>Fortsett</translation>
    </message>
 </context>
 <context>
@ -6060,7 +6060,7 @@ Kjerne: %3 %4</translation>
    </message>
    <message>
        <source>Group %1 not found.</source>
-        <translation type="unfinished"/>
+        <translation>Gruppe %1 ikke funnet.</translation>
    </message>
    <message>
        <source>Successfully added group %1.</source>
@ -6072,7 +6072,7 @@ Kjerne: %3 %4</translation>
    </message>
    <message>
        <source>FILENAME</source>
-        <translation type="unfinished"/>
+        <translation>FILNAVN</translation>
    </message>
    <message>
        <source>Analyze passwords for weaknesses and problems.</source>
@ -6436,7 +6436,7 @@ Kjerne: %3 %4</translation>
    <message>
        <source>Search (%1)...</source>
        <comment>Search placeholder text, %1 is the keyboard shortcut</comment>
-        <translation type="unfinished"/>
+        <translation>Søk (%1)...</translation>
    </message>
    <message>
        <source>Case sensitive</source>
@ -6447,7 +6447,7 @@ Kjerne: %3 %4</translation>
    <name>SettingsWidgetFdoSecrets</name>
    <message>
        <source>Options</source>
-        <translation type="unfinished"/>
+        <translation>Alternativer</translation>
    </message>
    <message>
        <source>Enable KeepassXC Freedesktop.org Secret Service integration</source>
@ -7054,7 +7054,7 @@ Example: JBSWY3DPEHPK3PXP</source>
    </message>
    <message>
        <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Importer fra 1Password</translation>
    </message>
    <message>
        <source>Open a recent database</source>
--- a/share/translations/keepassx_nl_NL.ts
+++ b/share/translations/keepassx_nl_NL.ts
@ -1213,12 +1213,12 @@ Om deze fout te voorkomen ga je naar &quot;Database instellingen.../Beveiliging&
    <message>
        <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Je kunt een hardwarebeveiligingssleutel gebruiken, zoals een &lt;strong&gt;YubiKey&lt;/strong&gt; of &lt;strong&gt;OnlyKey&lt;/strong&gt; met slots geconfigureerd voor HMAC-SHA1.&lt;/p&gt;
+        <translation>&lt;p&gt;Je kunt een hardwarebeveiligingssleutel gebruiken, zoals een &lt;strong&gt;YubiKey&lt;/strong&gt; of &lt;strong&gt;OnlyKey&lt;/strong&gt; met posities (&quot;slots&quot;) geconfigureerd voor HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Klik voor meer informatie...&lt;/p&gt;</translation>
    </message>
    <message>
        <source>&lt;p&gt;In addition to your master password, you can use a secret file to enhance the security of your database. Such a file can be generated in your database&apos;s security settings.&lt;/p&gt;&lt;p&gt;This is &lt;strong&gt;not&lt;/strong&gt; your *.kdbx database file!&lt;br&gt;If you do not have a key file, leave the field empty.&lt;/p&gt;&lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation>U kunt de beveiliging van uw database vergroten door naast het hoofdwachtwoord en geheim bestand te gebruiken. Dit bestand kan worden gegenereerd vanuit de beveiligingsinstellingen van uw database. Het betreft hier niet uw *.kdbx bestand! Als u geen sleutenbestand heeft, kunt u het vakje leeg laten. Klik hier voor meer informatie...</translation>
+        <translation>&lt;p&gt;Je kunt de beveiliging van uw database vergroten door naast het hoofdwachtwoord een geheim bestand te gebruiken. Zo een bestand kan worden gegenereerd vanuit de beveiligingsinstellingen van uw database.&lt;/p&gt;&lt;p&gt;Dit is &lt;strong&gt;niet&lt;/strong&gt; je *.kdbx database bestand!&lt;br&gt;Als je geen sleutelbestand hebt, kun je het veld leeg laten.&lt;/p&gt;&lt;p&gt;Klik hier voor meer informatie...&lt;/p&gt;</translation>
    </message>
    <message>
        <source>Key file help</source>
@ -1240,7 +1240,7 @@ Om deze fout te voorkomen ga je naar &quot;Database instellingen.../Beveiliging&
        <source>You cannot use your database file as a key file.
 If you do not have a key file, please leave the field empty.</source>
        <translation>Je kunt je database niet als sleutelbestand gebruiken.
-Als je geen sleutelbestand hebt, laat het veld leeg.</translation>
+Als je geen sleutelbestand hebt laat je het veld leeg.</translation>
    </message>
 </context>
 <context>
@ -2064,7 +2064,7 @@ Wil je de wijzigingen samenvoegen?</translation>
    </message>
    <message numerus="yes">
        <source>Delete entry(s)?</source>
-        <translation><numerusform>Verwijderen entry(s)?</numerusform><numerusform>Verwijderen entry(s)?</numerusform></translation>
+        <translation><numerusform>Verwijderen entry(s)?</numerusform><numerusform>Item(s) verwijderen?</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>Move entry(s) to recycle bin?</source>
@ -2223,7 +2223,7 @@ Veilig opslaan uitschakelen en opnieuw proberen?</translation>
    </message>
    <message>
        <source>Edit entry</source>
-        <translation>Item wijzigen</translation>
+        <translation>Item bewerken</translation>
    </message>
    <message>
        <source>Different passwords supplied.</source>
@ -2350,7 +2350,7 @@ Veilig opslaan uitschakelen en opnieuw proberen?</translation>
    </message>
    <message>
        <source>Edit attribute name</source>
-        <translation>Wijzig kenmerknaam</translation>
+        <translation>Kenmerknaam bewerken</translation>
    </message>
    <message>
        <source>Toggle attribute protection</source>
@ -2472,7 +2472,7 @@ Veilig opslaan uitschakelen en opnieuw proberen?</translation>
    </message>
    <message>
        <source>Edit</source>
-        <translation>Wijzigen</translation>
+        <translation>Bewerken</translation>
    </message>
 </context>
 <context>
@ -4491,11 +4491,11 @@ Wij raden je aan om de AppImage te gebruiken welke beschikbaar is op onze downlo
    </message>
    <message>
        <source>&amp;Edit entry</source>
-        <translation>&amp;Edit item</translation>
+        <translation>Item b&amp;ewerken</translation>
    </message>
    <message>
        <source>View or edit entry</source>
-        <translation>Bekijk/bewerk item</translation>
+        <translation>Item bekijken/bewerken</translation>
    </message>
    <message>
        <source>&amp;New group</source>
@ -5426,7 +5426,7 @@ Verwacht een aantal bugs en kleine problemen, deze versie is niet bedoeld voor p
    </message>
    <message>
        <source>Title for the entry.</source>
-        <translation>Naam voor deze entry.</translation>
+        <translation>Naam voor dit item.</translation>
    </message>
    <message>
        <source>title</source>
@ -6008,7 +6008,7 @@ Beschikbare opdrachten:
    </message>
    <message>
        <source>Deactivate password key for the database to merge from.</source>
-        <translation>Deactiveer de wachtwoordsleutel voor de database waaruit u wilt samenvoegen.</translation>
+        <translation>Deactiveer de wachtwoordsleutel voor de database waaruit je wil samenvoegen.</translation>
    </message>
    <message>
        <source>Version %1</source>
--- a/share/translations/keepassx_pl.ts
+++ b/share/translations/keepassx_pl.ts
@ -6290,7 +6290,7 @@ Jądro: %3 %4</translation>
    </message>
    <message>
        <source>Enter password to unlock %1: </source>
-        <translation>Wprowadź hasło odblokowujące %1:</translation>
+        <translation>Wprowadź hasło, aby odblokować %1: </translation>
    </message>
    <message>
        <source>Invalid YubiKey slot %1</source>
@ -6302,7 +6302,7 @@ Jądro: %3 %4</translation>
    </message>
    <message>
        <source>Enter password to encrypt database (optional): </source>
-        <translation>Wprowadź hasło do szyfrowania bazy danych (opcjonalnie):</translation>
+        <translation>Wprowadź hasło do szyfrowania bazy danych (opcjonalnie): </translation>
    </message>
    <message>
        <source>HIBP file, line %1: parse error</source>
@ -6993,7 +6993,7 @@ Jądro: %3 %4</translation>
    </message>
    <message>
        <source> digits</source>
-        <translation>cyfry</translation>
+        <translation> cyfry</translation>
    </message>
    <message>
        <source>Invalid TOTP Secret</source>
--- a/share/translations/keepassx_pt_PT.ts
+++ b/share/translations/keepassx_pt_PT.ts
@ -739,7 +739,7 @@ Selecione a base de dados correta para guardar as credenciais.</translation>
    </message>
    <message>
        <source>KeePassXC-Browser is needed for the browser integration to work. &lt;br /&gt;Download it for %1 and %2. %3</source>
-        <translation>Necessita de KeePassXC-Browser para que a integração funcione corretamente.&lt;br /&gt;Pode descarregar para %1 e para %2. %3</translation>
+        <translation>Necessita de KeePassXC-Browser para que a integração funcione corretamente.&lt;br /&gt;Disponível para %1 e para %2. %3</translation>
    </message>
    <message>
        <source>&amp;Brave</source>
--- a/share/translations/keepassx_sk.ts
+++ b/share/translations/keepassx_sk.ts
@ -3443,7 +3443,7 @@ Môže to spôsobiť nefunkčnosť dotknutých zásuvných modulov.</translation
    <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>
+        <translation><numerusform>%n položka bola použitá v %1</numerusform><numerusform>%n položky boli použité v %1</numerusform><numerusform>%n položiek bolo použitých v %1</numerusform><numerusform>%n položky bolo použitých v %1</numerusform></translation>
    </message>
 </context>
 <context>
@ -4104,7 +4104,7 @@ Ak sa to opakuje, potom môže byť súbor databázy poškodený.</translation>
    <name>KeeShare</name>
    <message>
        <source>Invalid sharing reference</source>
-        <translation type="unfinished"/>
+        <translation>Neplatný odkaz zdieľania</translation>
    </message>
    <message>
        <source>Inactive share %1</source>
@ -4606,11 +4606,11 @@ Očakávajte chyby a menšie problémy, táto verzia nie je určená na produkč
    </message>
    <message>
        <source>1Password Vault...</source>
-        <translation type="unfinished"/>
+        <translation>Úložisko 1Password...</translation>
    </message>
    <message>
        <source>Import a 1Password Vault</source>
-        <translation type="unfinished"/>
+        <translation>Importovať z úložiska 1Password</translation>
    </message>
    <message>
        <source>&amp;Getting Started</source>
@ -6197,7 +6197,7 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Path of the new database.</source>
-        <translation type="unfinished"/>
+        <translation>Cesta k novej databáze.</translation>
    </message>
    <message>
        <source>Unable to import XML database export %1</source>
@ -6221,7 +6221,7 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Yubikey slot for the second database.</source>
-        <translation type="unfinished"/>
+        <translation>Slot Yubikey pre druhú databázu.</translation>
    </message>
    <message>
        <source>Successfully merged %1 into %2.</source>
@ -6237,7 +6237,7 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Path of the entry to move.</source>
-        <translation type="unfinished"/>
+        <translation>Cesta položky na presun.</translation>
    </message>
    <message>
        <source>Path of the destination group.</source>
@ -6245,15 +6245,15 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Could not find group with path %1.</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno nájsť skupinu s cestou %1.</translation>
    </message>
    <message>
        <source>Entry is already in group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Položka už je v skupine %1.</translation>
    </message>
    <message>
        <source>Successfully moved entry %1 to group %2.</source>
-        <translation type="unfinished"/>
+        <translation>Položka %1 úspešne presunutá do skupiny %2.</translation>
    </message>
    <message>
        <source>Open a database.</source>
@ -6261,31 +6261,31 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Path of the group to remove.</source>
-        <translation type="unfinished"/>
+        <translation>Cesta skupiny na odstránenie.</translation>
    </message>
    <message>
        <source>Cannot remove root group from database.</source>
-        <translation type="unfinished"/>
+        <translation>Nemožno odstrániť koreňovú skupinu z databázy.</translation>
    </message>
    <message>
        <source>Successfully recycled group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Skupina %1 bola úspešne recyklovaná.</translation>
    </message>
    <message>
        <source>Successfully deleted group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Úspešne odstránená skupina %1.</translation>
    </message>
    <message>
        <source>Failed to open database file %1: not found</source>
-        <translation type="unfinished"/>
+        <translation>Zlyhalo otvorenie súboru databázy %1: nenájdené</translation>
    </message>
    <message>
        <source>Failed to open database file %1: not a plain file</source>
-        <translation type="unfinished"/>
+        <translation>Zlyhalo otvorenie súboru databázy %1: nie je súbor</translation>
    </message>
    <message>
        <source>Failed to open database file %1: not readable</source>
-        <translation type="unfinished"/>
+        <translation>Zlyhalo otvorenie súboru databázy %1: nie je čitateľné</translation>
    </message>
    <message>
        <source>Enter password to unlock %1: </source>
@ -6293,15 +6293,15 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Invalid YubiKey slot %1</source>
-        <translation type="unfinished"/>
+        <translation>Neplatný slot Yubikey %1</translation>
    </message>
    <message>
        <source>Please touch the button on your YubiKey to unlock %1</source>
-        <translation type="unfinished"/>
+        <translation>Prosím, stlačte tlačidlo svojho YubiKey na odomknutie %1</translation>
    </message>
    <message>
        <source>Enter password to encrypt database (optional): </source>
-        <translation type="unfinished"/>
+        <translation>Zadajte heslo na zašifrovanie databázy (voliteľné):</translation>
    </message>
    <message>
        <source>HIBP file, line %1: parse error</source>
@ -6325,11 +6325,11 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>Invalid password generator after applying all options</source>
-        <translation type="unfinished"/>
+        <translation>Neplatný generátor hesla po aplikovaní všetkých volieb</translation>
    </message>
    <message>
        <source>Show the protected attributes in clear text.</source>
-        <translation type="unfinished"/>
+        <translation>Zobraziť chránené atribúty ako prostý text.</translation>
    </message>
 </context>
 <context>
@ -6504,11 +6504,11 @@ Jadro: %3 %4</translation>
    </message>
    <message>
        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If recycle bin is enabled for the database, entries will be moved to recycle bin directly. Otherwise, they will be deleted without confirmation.&lt;/p&gt;&lt;p&gt;You will still be prompted if any entries are referenced by others.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Ak je pre databázu zapnutý kôš, položky budú presunuté priamo do koša. V opačnom prípade budú odstránené bez potvrdenia.&lt;/p&gt;&lt;p&gt;Potvrdenie bude vyžadované, len ak sú položky odkazované inými.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
    </message>
    <message>
        <source>Don&apos;t confirm when entries are deleted by clients.</source>
-        <translation type="unfinished"/>
+        <translation>Nepotvrdzovať pri odstránení položiek klientmi.</translation>
    </message>
    <message>
        <source>Exposed database groups:</source>
@ -7097,7 +7097,7 @@ Napríklad: JBSWY3DPEHPK3PXP</translation>
    </message>
    <message>
        <source>Import from 1Password</source>
-        <translation type="unfinished"/>
+        <translation>Importovať z 1Password</translation>
    </message>
    <message>
        <source>Open a recent database</source>
--- a/share/translations/keepassx_sv.ts
+++ b/share/translations/keepassx_sv.ts
@ -1172,11 +1172,11 @@ komma att tas bort för i framtiden.
    </message>
    <message>
        <source>Hardware Key:</source>
-        <translation>Hårdvarynyckel:</translation>
+        <translation>Hårdvarunyckel:</translation>
    </message>
    <message>
        <source>Hardware key help</source>
-        <translation>Hjälp med hårdvarynyckel</translation>
+        <translation>Hjälp med hårdvarunyckel</translation>
    </message>
    <message>
        <source>TouchID for Quick Unlock</source>
@ -1215,7 +1215,7 @@ För att förhindra att detta fel uppstår igen, måste du gå till &quot;Databa
    <message>
        <source>&lt;p&gt;You can use a hardware security key such as a &lt;strong&gt;YubiKey&lt;/strong&gt; or &lt;strong&gt;OnlyKey&lt;/strong&gt; with slots configured for HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Click for more information...&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Du kan använda en hårdvarynyckel såsom &lt;strong&gt;YubiKey&lt;/strong&gt; eller &lt;strong&gt;OnlyKey&lt;/strong&gt; med anslutningsplatser konfigurerade för HMAC-SHA1.&lt;/p&gt;
+        <translation>&lt;p&gt;Du kan använda en hårdvarunyckel såsom &lt;strong&gt;YubiKey&lt;/strong&gt; eller &lt;strong&gt;OnlyKey&lt;/strong&gt; med anslutningsplatser konfigurerade för HMAC-SHA1.&lt;/p&gt;
 &lt;p&gt;Klicka för mer information...&lt;/p&gt;</translation>
    </message>
    <message>
@ -3755,7 +3755,7 @@ Om detta upprepas, kan din databasfil vara skadad.</translation>
    </message>
    <message>
        <source>Invalid transform rounds size</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig storlek på transformeringsrundor</translation>
    </message>
    <message>
        <source>Invalid start bytes size</source>
@ -3812,23 +3812,23 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
    </message>
    <message>
        <source>Missing icon uuid or data</source>
-        <translation type="unfinished"/>
+        <translation>Saknar uuid eller data för ikon</translation>
    </message>
    <message>
        <source>Missing custom data key or value</source>
-        <translation type="unfinished"/>
+        <translation>Anpassad datanyckel eller värde saknas</translation>
    </message>
    <message>
        <source>Multiple group elements</source>
-        <translation type="unfinished"/>
+        <translation>Flera gruppelement</translation>
    </message>
    <message>
        <source>Null group uuid</source>
-        <translation type="unfinished"/>
+        <translation>uuid för grupp är null</translation>
    </message>
    <message>
        <source>Invalid group icon number</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt gruppnummer för ikon</translation>
    </message>
    <message>
        <source>Invalid EnableAutoType value</source>
@ -3840,7 +3840,7 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
    </message>
    <message>
        <source>No group uuid found</source>
-        <translation type="unfinished"/>
+        <translation>Inget grupp-uuid hittades</translation>
    </message>
    <message>
        <source>Null DeleteObject uuid</source>
@ -3864,27 +3864,27 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
    </message>
    <message>
        <source>No entry uuid found</source>
-        <translation type="unfinished"/>
+        <translation>Inget post-uuid hittades</translation>
    </message>
    <message>
        <source>History element with different uuid</source>
-        <translation type="unfinished"/>
+        <translation>Historikelement med annat uuid</translation>
    </message>
    <message>
        <source>Duplicate custom attribute found</source>
-        <translation type="unfinished"/>
+        <translation>Duplicerat anpassat attribut hittades</translation>
    </message>
    <message>
        <source>Entry string key or value missing</source>
-        <translation type="unfinished"/>
+        <translation>Postens text-nyckel eller värde saknas</translation>
    </message>
    <message>
        <source>Duplicate attachment found</source>
-        <translation type="unfinished"/>
+        <translation>Duplicerad bilaga hittades</translation>
    </message>
    <message>
        <source>Entry binary key or value missing</source>
-        <translation type="unfinished"/>
+        <translation>Postens binär-nyckel eller värde saknas</translation>
    </message>
    <message>
        <source>Auto-type association window or sequence missing</source>
@ -3892,19 +3892,19 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
    </message>
    <message>
        <source>Invalid bool value</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt bool värde</translation>
    </message>
    <message>
        <source>Invalid date time value</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt datum-/tidsvärde</translation>
    </message>
    <message>
        <source>Invalid color value</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt färgvärde</translation>
    </message>
    <message>
        <source>Invalid color rgb part</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt färg rgb del</translation>
    </message>
    <message>
        <source>Invalid number value</source>
@ -3912,7 +3912,7 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
    </message>
    <message>
        <source>Invalid uuid value</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt uuid-värde</translation>
    </message>
    <message>
        <source>Unable to decompress binary</source>
@ -3923,7 +3923,9 @@ Detta är en envägsmigrering. Du kommer inte att kunna öppna den importerade d
        <source>XML error:
 %1
 Line %2, column %3</source>
-        <translation type="unfinished"/>
+        <translation>XML-fel:
 %1
 Rad %2, kolumn: %3</translation>
    </message>
 </context>
 <context>
@ -4030,19 +4032,19 @@ Line %2, column %3</source>
    </message>
    <message>
        <source>Incorrect group icon field size</source>
-        <translation type="unfinished"/>
+        <translation>Felaktig gruppikonstorlek</translation>
    </message>
    <message>
        <source>Incorrect group level field size</source>
-        <translation type="unfinished"/>
+        <translation>Felaktig gruppnivåstorlek</translation>
    </message>
    <message>
        <source>Invalid group field type</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig grupptyp</translation>
    </message>
    <message>
        <source>Missing group id or level</source>
-        <translation type="unfinished"/>
+        <translation>Grupp-ID eller nivå saknas</translation>
    </message>
    <message>
        <source>Missing entry field type number</source>
@ -4082,11 +4084,11 @@ Line %2, column %3</source>
    </message>
    <message>
        <source>Invalid entry field type</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltig posttyp</translation>
    </message>
    <message>
        <source>unable to seek to content position</source>
-        <translation type="unfinished"/>
+        <translation>kunde inte söka till innehållets position</translation>
    </message>
    <message>
        <source>Invalid credentials were provided, please try again.
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.ts
@ -989,7 +989,7 @@ chrome-на-ноутбуці.</translation>
    <message>
        <source>CSV import: writer has errors:
 %1</source>
-        <translation>Імпорт CSV: помилки записувача:
+        <translation>Імпортування CSV: помилки записувача:
 %1</translation>
    </message>
    <message>
@ -1921,7 +1921,7 @@ Are you sure you want to continue without a password?</source>
    </message>
    <message>
        <source>Export database to CSV file</source>
-        <translation>Експортувати сховище у файл CSV</translation>
+        <translation>Експортувати сховище до файлу CSV</translation>
    </message>
    <message>
        <source>Writing the CSV file failed.</source>
@ -1966,7 +1966,7 @@ This is definitely a bug, please report it to the developers.</source>
    </message>
    <message>
        <source>Export database to HTML file</source>
-        <translation>Експортувати сховище в HTML</translation>
+        <translation>Експортувати сховище до файлу HTML</translation>
    </message>
    <message>
        <source>HTML file</source>
@ -1978,7 +1978,7 @@ This is definitely a bug, please report it to the developers.</source>
    </message>
    <message>
        <source>Export Confirmation</source>
-        <translation>Схвалення експорту</translation>
+        <translation>Схвалення експортування</translation>
    </message>
    <message>
        <source>You are about to export your database to an unencrypted file. This will leave your passwords and sensitive information vulnerable! Are you sure you want to continue?</source>
@ -2783,7 +2783,7 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>Select export target</source>
-        <translation>Вибрати ціль експорту</translation>
+        <translation>Вибрати ціль експортування</translation>
    </message>
    <message>
        <source>Select import/export file</source>
@ -2795,11 +2795,11 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>Import</source>
-        <translation>Імпорт</translation>
+        <translation>Імпортування</translation>
    </message>
    <message>
        <source>Export</source>
-        <translation>Експорт</translation>
+        <translation>Експортування</translation>
    </message>
    <message>
        <source>Synchronize</source>
@ -2826,15 +2826,15 @@ Supported extensions are: %1.</source>
    <message>
        <source>KeeShare is currently disabled. You can enable import/export in the application settings.</source>
        <comment>KeeShare is a proper noun</comment>
-        <translation>KeeShare наразі вимкнено. Ви можете ввімкнути імпорт та експорт у налаштуванні застосунку.</translation>
+        <translation>KeeShare наразі вимкнено. Ви можете ввімкнути імпортування та експортування у параметрах застосунку.</translation>
    </message>
    <message>
        <source>Database export is currently disabled by application settings.</source>
-        <translation>Експорт сховища наразі вимкнено в налаштуванні застосунку.</translation>
+        <translation>Експортування сховища наразі вимкнено в параметрах застосунку.</translation>
    </message>
    <message>
        <source>Database import is currently disabled by application settings.</source>
-        <translation>Імпорт сховища наразі вимкнено в налаштуванні застосунку.</translation>
+        <translation>Імпортування сховища наразі вимкнено в параметрах застосунку.</translation>
    </message>
    <message>
        <source>Sharing mode field</source>
@ -3782,7 +3782,7 @@ You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
        <translation>Вибраний файл є старим сховищем для KeePass 1 (.kdb).
-Щоб імпортувати його, виберіть пункт меню «Сховище &gt; Імпортувати сховище KeePass 1…».
+Щоб імпортувати його, виберіть пункт меню «Сховище &gt; Імпортувати &gt; Сховище KeePass 1…».
 Перетворення можливе лише в одному напрямку. Ви не зможете відкрити імпортоване сховище старою версією KeePassX 0.4.</translation>
    </message>
    <message>
@ -4123,11 +4123,11 @@ If this reoccurs, then your database file may be corrupt.</source>
    </message>
    <message>
        <source>Import is disabled in settings</source>
-        <translation>Імпорт вимкнено у параметрах</translation>
+        <translation>Імпортування вимкнено у параметрах</translation>
    </message>
    <message>
        <source>Export is disabled in settings</source>
-        <translation>Експорт вимкнено у параметрах</translation>
+        <translation>Експортування вимкнено у параметрах</translation>
    </message>
    <message>
        <source>Inactive share</source>
@ -4573,7 +4573,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>&amp;Export</source>
-        <translation>&amp;Експорт</translation>
+        <translation>&amp;Експортувати</translation>
    </message>
    <message>
        <source>&amp;Check for Updates...</source>
@ -4601,7 +4601,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>&amp;Export to HTML file...</source>
-        <translation>Експортувати у файл HTML...</translation>
+        <translation>Експортувати до файлу HTML...</translation>
    </message>
    <message>
        <source>1Password Vault...</source>
@ -6157,7 +6157,7 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Format to use when exporting. Available choices are xml or csv. Defaults to xml.</source>
-        <translation>Формат для експорту. Можливі формати: xml або csv. Типовий формат — xml.</translation>
+        <translation>Формат для експортування. Можливі формати: xml або csv. Типовий формат — xml.</translation>
    </message>
    <message>
        <source>Exports the content of a database to standard output in the specified format.</source>
@ -6193,7 +6193,7 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Path of the XML database export.</source>
-        <translation>Шлях для експорту сховища XML.</translation>
+        <translation>Шлях для експортування сховища XML.</translation>
    </message>
    <message>
        <source>Path of the new database.</source>
@ -6579,11 +6579,11 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Allow export</source>
-        <translation>Дозволити експорт</translation>
+        <translation>Дозволити експортування</translation>
    </message>
    <message>
        <source>Allow import</source>
-        <translation>Дозволити імпорт</translation>
+        <translation>Дозволити імпортування</translation>
    </message>
    <message>
        <source>Own certificate</source>
@ -6611,11 +6611,11 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Import</source>
-        <translation>Імпорт</translation>
+        <translation>Імпортування</translation>
    </message>
    <message>
        <source>Export</source>
-        <translation>Експорт</translation>
+        <translation>Експортування</translation>
    </message>
    <message>
        <source>Imported certificates</source>
@ -6696,11 +6696,11 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Allow KeeShare imports</source>
-        <translation>Дозволити імпорт KeeShare</translation>
+        <translation>Дозволити імпортування KeeShare</translation>
    </message>
    <message>
        <source>Allow KeeShare exports</source>
-        <translation>Дозволити експорт KeeShare</translation>
+        <translation>Дозволити експортування KeeShare</translation>
    </message>
    <message>
        <source>Only show warnings and errors</source>
@ -6779,7 +6779,7 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Could not write export container</source>
-        <translation>Неможливо записати експортну оболонку</translation>
+        <translation>Неможливо записати експортовану оболонку</translation>
    </message>
    <message>
        <source>Unexpected export error occurred</source>
@ -6885,7 +6885,7 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Export to %1</source>
-        <translation>Експортування %1</translation>
+        <translation>Експортування до %1</translation>
    </message>
    <message>
        <source>Multiple import source path to %1 in %2</source>
@ -6893,7 +6893,7 @@ Kernel: %3 %4</source>
    </message>
    <message>
        <source>Conflicting export target path %1 in %2</source>
-        <translation>Суперечливий шлях для експорту %1 у %2</translation>
+        <translation>Суперечливий шлях для експортування %1 до %2</translation>
    </message>
 </context>
 <context>
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@ -1,5 +1,5 @@
 name: keepassxc
-version: 2.5.3
+version: 2.5.4
 grade: stable
 summary: Community-driven port of the Windows application “KeePass Password Safe”
 description: |
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@ -354,6 +354,7 @@ target_link_libraries(${PROGNAME} keepassx_core)
 set_target_properties(${PROGNAME} PROPERTIES ENABLE_EXPORTS ON)
 if(APPLE AND WITH_APP_BUNDLE)
    install(FILES ${CMAKE_SOURCE_DIR}/share/macosx/embedded.provisionprofile DESTINATION ${BUNDLE_INSTALL_DIR})
    configure_file(${CMAKE_SOURCE_DIR}/share/macosx/Info.plist.cmake ${CMAKE_CURRENT_BINARY_DIR}/Info.plist)
    set_target_properties(${PROGNAME} PROPERTIES
            MACOSX_BUNDLE ON
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@ -1646,6 +1646,8 @@ bool DatabaseWidget::save()
    m_blockAutoSave = true;
    ++m_saveAttempts;
    auto focusWidget = qApp->focusWidget();
    // TODO: Make this async
    // Lock out interactions
    m_entryView->setDisabled(true);
@ -1660,6 +1662,10 @@ bool DatabaseWidget::save()
    m_entryView->setDisabled(false);
    m_groupView->setDisabled(false);
    if (focusWidget) {
        focusWidget->setFocus();
    }
    if (ok) {
        m_saveAttempts = 0;
        m_blockAutoSave = false;