Merge branch 'master' into develop

2025-02-22 15:39:57 -05:00 · 2019-05-31 16:17:47 -04:00 · 2019-05-31 16:17:47 -04:00 · 16a11c3a7f
commit 16a11c3a7f
parent 63aab99b9c a775031fe9
24 changed files with 1044 additions and 926 deletions
--- a/29
+++ b/29
@ -1,3 +1,32 @@
+2.4.2 (2019-05-31)
+=========================
+
+- Improve resilience against memory attacks - overwrite memory before free [#3020]
+- Prevent infinite save loop when location is unavailable [#3026]
+- Attempt to fix quitting application when shutdown or logout issued [#3199]
+- Support merging database custom data [#3002]
+- Fix opening URL's with non-http schemes [#3153]
+- Fix data loss due to not reading all database attachments if duplicates exist [#3180]
+- Fix entry context menu disabling when using keyboard navigation [#3199]
+- Fix behaviors when canceling an entry edit [#3199]
+- Fix processing of tray icon click and doubleclick [#3112]
+- Update group in preview widget when focused [#3199]
+- Prefer DuckDuckGo service over direct icon download (increases resolution) [#2996]
+- Remove apply button in application settings [#3019]
+- Use winqtdeploy on Windows to correct deployment issues [#3025]
+- Don't mark entry edit as modified when attribute selection changes [#3041]
+- Use console code page CP_UTF8 on Windows if supported [#3050]
+- Snap: Fix locking database with session lock [#3046]
+- Snap: Fix theming across Linux distributions [#3057]
+- Snap: Use SNAP_USER_COMMON and SNAP_USER_DATA directories [#3131]
+- KeeShare: Automatically enable WITH_XC_KEESHARE_SECURE if quazip is found [#3088]
+- macOS: Fix toolbar text when in dark mode [#2998]
+- macOS: Lock database on switching user [#3097]
+- macOS: Fix global Auto-Type when the database is locked [#3138]
+- Browser: Close popups when database is locked [#3093]
+- Browser: Add tests [#3016]
+- Browser: Don't create default group if custom group is enabled [#3127]
+
 2.4.1 (2019-04-12)
 =========================

--- a/share/linux/org.keepassxc.KeePassXC.appdata.xml
+++ b/share/linux/org.keepassxc.KeePassXC.appdata.xml
@ -50,6 +50,37 @@
    </screenshots>

    <releases>
+        <release version="2.4.2" date="2019-05-31">
+            <description>
+                <ul>
+                    <li>Improve resilience against memory attacks - overwrite memory before free [#3020]</li>
+                    <li>Prevent infinite save loop when location is unavailable [#3026]</li>
+                    <li>Attempt to fix quitting application when shutdown or logout issued [#3199]</li>
+                    <li>Support merging database custom data [#3002]</li>
+                    <li>Fix opening URL's with non-http schemes [#3153]</li>
+                    <li>Fix data loss due to not reading all database attachments if duplicates exist [#3180]</li>
+                    <li>Fix entry context menu disabling when using keyboard navigation [#3199]</li>
+                    <li>Fix behaviors when canceling an entry edit [#3199]</li>
+                    <li>Fix processing of tray icon click and doubleclick [#3112]</li>
+                    <li>Update group in preview widget when focused [#3199]</li>
+                    <li>Prefer DuckDuckGo service over direct icon download (increases resolution) [#2996]</li>
+                    <li>Remove apply button in application settings [#3019]</li>
+                    <li>Use winqtdeploy on Windows to correct deployment issues [#3025]</li>
+                    <li>Don't mark entry edit as modified when attribute selection changes [#3041]</li>
+                    <li>Use console code page CP_UTF8 on Windows if supported [#3050]</li>
+                    <li>Snap: Fix locking database with session lock [#3046]</li>
+                    <li>Snap: Fix theming across Linux distributions [#3057]</li>
+                    <li>Snap: Use SNAP_USER_COMMON and SNAP_USER_DATA directories [#3131]</li>
+                    <li>KeeShare: Automatically enable WITH_XC_KEESHARE_SECURE if quazip is found [#3088]</li>
+                    <li>macOS: Fix toolbar text when in dark mode [#2998]</li>
+                    <li>macOS: Lock database on switching user [#3097]</li>
+                    <li>macOS: Fix global Auto-Type when the database is locked [#3138]</li>
+                    <li>Browser: Close popups when database is locked [#3093]</li>
+                    <li>Browser: Add tests [#3016]</li>
+                    <li>Browser: Don't create default group if custom group is enabled [#3127]</li>
+                </ul>
+            </description>
+        </release>
        <release version="2.4.1" date="2019-04-12">
            <description>
                <ul>
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@ -1531,7 +1531,7 @@ Möchten Sie Ihre Änderungen zusammenführen?</translation>
    </message>
    <message numerus="yes">
        <source>Do you really want to delete %n entry(s) for good?</source>
-        <translation><numerusform>Sollen tatsächlich %1 Einträge gelöscht werden?</numerusform><numerusform>Sollen tatsächlich %1 Einträge gelöscht werden?</numerusform></translation>
+        <translation><numerusform>Sollen tatsächlich %n Einträge gelöscht werden?</numerusform><numerusform>Sollen tatsächlich %n Einträge gelöscht werden?</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>Delete entry(s)?</source>
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@ -326,8 +326,8 @@
        <translation>Privacy</translation>
    </message>
    <message>
-        <source>Use DuckDuckGo as fallback for downloading website icons</source>
-        <translation>Use DuckDuckGo as fallback for downloading website icons</translation>
+        <source>Use DuckDuckGo service to download website icons</source>
+        <translation type="unfinished"></translation>
    </message>
 </context>
 <context>
@ -631,6 +631,14 @@ Please select the correct database for saving credentials.</translation>
        <source>&amp;Brave</source>
        <translation type="unfinished"></translation>
    </message>
+    <message>
+        <source>Returns expired credentials. String [expired] is added to the title.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Allow returning expired credentials.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>BrowserService</name>
@ -2244,10 +2252,6 @@ Supported extensions are: %1.</source>
        <source>Custom icon successfully downloaded</source>
        <translation>Custom icon successfully downloaded</translation>
    </message>
-    <message>
-        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</translation>
-    </message>
    <message>
        <source>Select Image(s)</source>
        <translation>Select Image(s)</translation>
@ -2284,6 +2288,10 @@ Supported extensions are: %1.</source>
            <numerusform>This icon is used by %n entry(s), and will be replaced by the default icon. Are you sure you want to delete it?</numerusform>
        </translation>
    </message>
+    <message>
+        <source>You can enable the DuckDuckGo website icon service under Tools -&gt; Settings -&gt; Security</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>EditWidgetProperties</name>
@ -3750,6 +3758,14 @@ Expect some bugs and minor issues, this version is not meant for production use.
        <source>Adding missing icon %1</source>
        <translation>Adding missing icon %1</translation>
    </message>
+    <message>
+        <source>Removed custom data %1 [%2]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Adding custom data %1 [%2]</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
    <name>NewDatabaseWizard</name>
--- a/share/translations/keepassx_es.ts
+++ b/share/translations/keepassx_es.ts
@ -200,27 +200,27 @@
    </message>
    <message>
        <source>Auto-Type</source>
-        <translation>Auto-Escritura</translation>
+        <translation>Autoescritura</translation>
    </message>
    <message>
        <source>Use entry title to match windows for global Auto-Type</source>
-        <translation>Use título de entrada para acertar ventanas en Auto-Escritura global.</translation>
+        <translation>Usar título de la entrada para emparejar ventanas en autoescritura global</translation>
    </message>
    <message>
        <source>Use entry URL to match windows for global Auto-Type</source>
-        <translation>Use URL para acertar ventanas en Auto-Escritura global</translation>
+        <translation>Usar URL de la entrada para emparejar ventanas en autoescritura global</translation>
    </message>
    <message>
        <source>Always ask before performing Auto-Type</source>
-        <translation>Siempre preguntar antes de hacer Auto-Escritura</translation>
+        <translation>Siempre preguntar antes de hacer autoescritura</translation>
    </message>
    <message>
        <source>Global Auto-Type shortcut</source>
-        <translation>Atajo global de Auto-Escritura</translation>
+        <translation>Atajo global de autoescritura</translation>
    </message>
    <message>
        <source>Auto-Type typing delay</source>
-        <translation>Escribiendo retardo de la Auto-Escritura</translation>
+        <translation>Escribiendo retardo de la autoescritura</translation>
    </message>
    <message>
        <source> ms</source>
@ -229,7 +229,7 @@
    </message>
    <message>
        <source>Auto-Type start delay</source>
-        <translation>Iniciar retardo de Auto-Escritura</translation>
+        <translation>Iniciar retardo de autoescritura</translation>
    </message>
    <message>
        <source>Check for updates at application startup</source>
@ -293,7 +293,7 @@
    </message>
    <message>
        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation>Volver a bloquear la base de datos tras realizar una Auto-Escritura </translation>
+        <translation>Volver a bloquear la base de datos tras realizar una autoescritura</translation>
    </message>
    <message>
        <source>Don&apos;t require password repeat when it is visible</source>
@ -332,27 +332,27 @@
    </message>
    <message>
        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-Escritura - KeePassXC</translation>
+        <translation>Autoescritura - KeePassXC</translation>
    </message>
    <message>
        <source>Auto-Type</source>
-        <translation>Auto-Escritura</translation>
+        <translation>Autoescritura</translation>
    </message>
    <message>
        <source>The Syntax of your Auto-Type statement is incorrect!</source>
-        <translation>¡La sintaxis de la declaración de su Auto-Escritura es incorrecta!</translation>
+        <translation>¡La sintaxis de la declaración de su autoescritura es incorrecta!</translation>
    </message>
    <message>
        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
-        <translation>Este comando de Auto-Escritura contiene un retraso muy largo. ¿Realmente desea continuar?</translation>
+        <translation>Este comando de autoescritura contiene un retraso muy largo. ¿Realmente desea continuar?</translation>
    </message>
    <message>
        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
-        <translation>Este comando de Auto-Escritura contiene pulsaciones de teclas muy lentas. ¿Realmente desea continuar?</translation>
+        <translation>Este comando de autoescritura contiene pulsaciones de teclas muy lentas. ¿Realmente desea continuar?</translation>
    </message>
    <message>
        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
-        <translation>Este comando de Auto-Escritura contiene argumentos que se repiten muy a menudo. ¿Realmente desea continuar?</translation>
+        <translation>Este comando de autoescritura contiene argumentos que se repiten muy a menudo. ¿Realmente desea continuar?</translation>
    </message>
 </context>
 <context>
@ -393,11 +393,11 @@
    <name>AutoTypeSelectDialog</name>
    <message>
        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-Escritura - KeePassXC</translation>
+        <translation>Autoescritura - KeePassXC</translation>
    </message>
    <message>
        <source>Select entry to Auto-Type:</source>
-        <translation>Seleccionar entrada para Auto-Escritura:</translation>
+        <translation>Seleccionar entrada para autoescritura:</translation>
    </message>
 </context>
 <context>
@ -884,7 +884,7 @@ Es necesario para mantener sus conexiones presentes del navegador.
    <name>DatabaseOpenDialog</name>
    <message>
        <source>Unlock Database - KeePassXC</source>
-        <translation>Desbloquear Base de Datos - KeePassXC</translation>
+        <translation>Desbloquear base de datos - KeePassXC</translation>
    </message>
 </context>
 <context>
@ -1259,7 +1259,7 @@ Si conserva este número, ¡su base de datos puede ser muy fácil de descifrar!<
    <name>DatabaseSettingsWidgetGeneral</name>
    <message>
        <source>Database Meta Data</source>
-        <translation>Metadatos de la Base de Datos</translation>
+        <translation>Metadatos de la base de datos</translation>
    </message>
    <message>
        <source>Database name:</source>
@ -1295,7 +1295,7 @@ Si conserva este número, ¡su base de datos puede ser muy fácil de descifrar!<
    </message>
    <message>
        <source>Additional Database Settings</source>
-        <translation>Configuraciones Adicionales de la Base de Datos</translation>
+        <translation>Configuraciones adicionales de la base de datos</translation>
    </message>
    <message>
        <source>Enable &amp;compression (recommended)</source>
@ -1438,12 +1438,12 @@ Esto es definitivamente un error, por favor repórtelo a los desarrolladores.</t
    </message>
    <message>
        <source>New Database</source>
-        <translation>Nueva Base de datos</translation>
+        <translation>Nueva base de datos</translation>
    </message>
    <message>
        <source>%1 [New Database]</source>
        <comment>Database tab name modifier</comment>
-        <translation>%1 [Nueva Base de Datos]</translation>
+        <translation>%1 [Nueva base de datos]</translation>
    </message>
    <message>
        <source>%1 [Locked]</source>
@ -1549,7 +1549,7 @@ Do you want to merge your changes?</source>
    </message>
    <message>
        <source>Lock Database?</source>
-        <translation>¿Bloquear la Base de datos?</translation>
+        <translation>¿Bloquear la base de datos?</translation>
    </message>
    <message>
        <source>You are editing an entry. Discard changes and lock anyway?</source>
@ -1654,7 +1654,7 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>Auto-Type</source>
-        <translation>Auto-Escritura</translation>
+        <translation>Autoescritura</translation>
    </message>
    <message>
        <source>Properties</source>
@ -1800,15 +1800,15 @@ Disable safe saves and try again?</source>
    <name>EditEntryWidgetAutoType</name>
    <message>
        <source>Enable Auto-Type for this entry</source>
-        <translation>Activar Auto-Escritura para esta entrada</translation>
+        <translation>Activar autoescritura para esta entrada</translation>
    </message>
    <message>
        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Heredar la secuencia de Auto-Escritura por defecto del &amp;grupo</translation>
+        <translation>Heredar la secuencia de autoescritura por defecto del &amp;grupo</translation>
    </message>
    <message>
        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usar secuencia de Auto-Escritura personalizada:</translation>
+        <translation>&amp;Usar secuencia de autoescritura personalizada:</translation>
    </message>
    <message>
        <source>Window Associations</source>
@ -2111,15 +2111,15 @@ Disable safe saves and try again?</source>
    </message>
    <message>
        <source>Auto-Type</source>
-        <translation>Auto-Escritura</translation>
+        <translation>Autoescritura</translation>
    </message>
    <message>
        <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation>&amp;Usar por defecto la secuencia de Auto-Escritura del grupo padre</translation>
+        <translation>&amp;Usar por defecto la secuencia de autoescritura del grupo padre</translation>
    </message>
    <message>
        <source>Set default Auto-Type se&amp;quence</source>
-        <translation>Seleccionar se&amp;cuencia de Auto-Escritura por defecto</translation>
+        <translation>Seleccionar se&amp;cuencia de autoescritura por defecto</translation>
    </message>
 </context>
 <context>
@ -2932,7 +2932,7 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
    </message>
    <message>
        <source>Auto-type association window or sequence missing</source>
-        <translation>Falta de secuencia o ventana de asociación de Auto-Escritura</translation>
+        <translation>Falta de secuencia o ventana de asociación de autoescritura</translation>
    </message>
    <message>
        <source>Invalid bool value</source>
@ -3522,7 +3522,7 @@ Le recomendamos que utilice la AppImage disponible en nuestra página de descarg
    </message>
    <message>
        <source>Perform &amp;Auto-Type</source>
-        <translation>Realizar &amp;Auto-Escritura</translation>
+        <translation>Realizar &amp;autoescritura</translation>
    </message>
    <message>
        <source>Open &amp;URL</source>
@ -4857,7 +4857,7 @@ Comandos disponibles:
    </message>
    <message>
        <source>Database password: </source>
-        <translation>Contraseña de la Base de Datos:</translation>
+        <translation>Contraseña de la base de datos:</translation>
    </message>
    <message>
        <source>Cannot create new group</source>
--- a/share/translations/keepassx_eu.ts
+++ b/share/translations/keepassx_eu.ts
--- a/share/translations/keepassx_fr.ts
+++ b/share/translations/keepassx_fr.ts
@ -611,7 +611,7 @@ Veuillez sélectionner la base de donnée souhaitée pour enregistrer les identi
    </message>
    <message>
        <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
-        <translation type="unfinished"/>
+        <translation>À cause du mécanisme de sandboxing Snap, vous devez lancer un script pour activer l&apos;intégration du navigateur.&lt;br /&gt;Vous pouvez obtenir ce script depuis %1</translation>
    </message>
    <message>
        <source>Please see special instructions for browser extension use below</source>
@ -710,7 +710,7 @@ Voulez-vous créer ce groupe ?
        <source>Your KeePassXC-Browser settings need to be moved into the database settings.
 This is necessary to maintain your current browser connections.
 Would you like to migrate your existing settings now?</source>
-        <translation type="unfinished"/>
+        <translation>Vos réglages pour KeePassXC-Browser doivent être intégrés dans les réglages de la base de données. Ceci est nécessaire pour maintenir vos connexions actuelles avec le navigateur ouvertes. Souhaitez-vous effectuer la migration de vos réglages maintenant ?</translation>
    </message>
 </context>
 <context>
@ -874,7 +874,7 @@ Would you like to migrate your existing settings now?</source>
    </message>
    <message>
        <source>Key not transformed. This is a bug, please report it to the developers!</source>
-        <translation type="unfinished"/>
+        <translation>La clé n&apos;a pas été transformée. Ceci est un bogue, pouvez-vous s&apos;il vous plaît le signaler aux développeurs ?</translation>
    </message>
 </context>
 <context>
@ -1071,7 +1071,7 @@ Cela peut empêcher la connexion avec l&apos;extension de navigateur.</translati
    <message>
        <source>Do you really want forget all site-specific settings on every entry?
 Permissions to access entries will be revoked.</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous sûr de vouloir effacer les préférences de site pour toutes les entrées ? Les permissions d&apos;accès aux entrées seront révoquées.</translation>
    </message>
    <message>
        <source>Removing stored permissions…</source>
@ -1099,12 +1099,13 @@ Permissions to access entries will be revoked.</source>
    </message>
    <message>
        <source>Move KeePassHTTP attributes to custom data</source>
-        <translation type="unfinished"/>
+        <translation>Déplacer les attributs KeePassHTTP vers les données personnalisées</translation>
    </message>
    <message>
        <source>Do you really want to move all legacy browser integration data to the latest standard?
 This is necessary to maintain compatibility with the browser plugin.</source>
-        <translation type="unfinished"/>
+        <translation>Voulez-vous convertir toutes les anciennes données d&apos;intégration au navigateur en version plus récente ?
+Ceci est nécessaire pour assurer la compatibilité de l&apos;extension.</translation>
    </message>
 </context>
 <context>
@ -1528,7 +1529,7 @@ Voulez-vous fusionner vos changements ?</translation>
    </message>
    <message numerus="yes">
        <source>Do you really want to delete %n entry(s) for good?</source>
-        <translation><numerusform>Voulez-vous vraiment supprimer définitivement %1 entrée ?</numerusform><numerusform>Voulez-vous vraiment supprimer définitivement %1 entrées ?</numerusform></translation>
+        <translation><numerusform>Voulez-vous vraiment supprimer définitivement %n entrée ?</numerusform><numerusform>Voulez-vous vraiment supprimer définitivement %n entrées ?</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>Delete entry(s)?</source>
@ -3463,7 +3464,7 @@ Nous recommandons l&apos;utilisation de l&apos;AppImage disponible sur notre pag
    </message>
    <message>
        <source>&amp;New database...</source>
-        <translation>&amp;Ńouvelle base de données...</translation>
+        <translation>&amp;Nouvelle base de données...</translation>
    </message>
    <message>
        <source>Create a new database</source>
@ -4513,7 +4514,7 @@ Commandes disponibles :
    </message>
    <message>
        <source>Multi-word extra bits %1</source>
-        <translation type="unfinished"/>
+        <translation>Octets additionnels mots multiples %1</translation>
    </message>
    <message>
        <source>Type: Bruteforce</source>
@ -4561,7 +4562,7 @@ Commandes disponibles :
    </message>
    <message>
        <source>Type: Dict+Leet(Rep)</source>
-        <translation type="unfinished"/>
+        <translation>Type : Dictionnaire + Leet (rep)</translation>
    </message>
    <message>
        <source>Type: User Words(Rep)</source>
@ -4569,7 +4570,7 @@ Commandes disponibles :
    </message>
    <message>
        <source>Type: User+Leet(Rep)</source>
-        <translation type="unfinished"/>
+        <translation>Type : Utilisateur + Leet (rep)</translation>
    </message>
    <message>
        <source>Type: Repeated(Rep)</source>
@ -4597,7 +4598,7 @@ Commandes disponibles :
    </message>
    <message>
        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
-        <translation type="unfinished"/>
+        <translation>*** Longueur du mot de passe (%1) != longueurs additionnées des morceaux (%2) ***</translation>
    </message>
    <message>
        <source>Failed to load key file %1: %2</source>
@ -4933,11 +4934,11 @@ Commandes disponibles :
    </message>
    <message>
        <source>Search terms are as follows: [modifiers][field:][&quot;]term[&quot;]</source>
-        <translation type="unfinished"/>
+        <translation>Les termes de recherche sont construits comme suit : [modificateurs][champ:][&quot;]terme[&quot;]</translation>
    </message>
    <message>
        <source>Every search term must match (ie, logical AND)</source>
-        <translation type="unfinished"/>
+        <translation>Tous les termes doivent correspondre (ET logique)</translation>
    </message>
    <message>
        <source>Modifiers</source>
@ -4961,15 +4962,15 @@ Commandes disponibles :
    </message>
    <message>
        <source>Term Wildcards</source>
-        <translation type="unfinished"/>
+        <translation>Caractères spéciaux</translation>
    </message>
    <message>
        <source>match anything</source>
-        <translation type="unfinished"/>
+        <translation>correspond à n&apos;importe quel caractère</translation>
    </message>
    <message>
        <source>match one</source>
-        <translation type="unfinished"/>
+        <translation>correspond à un seul caractère</translation>
    </message>
    <message>
        <source>logical OR</source>
@ -5105,7 +5106,7 @@ Commandes disponibles :
    <message>
        <source>key.share</source>
        <comment>Filetype for KeeShare key</comment>
-        <translation type="unfinished"/>
+        <translation>cle.share</translation>
    </message>
    <message>
        <source>KeeShare key file</source>
@ -5121,15 +5122,15 @@ Commandes disponibles :
    </message>
    <message>
        <source>Exporting changed certificate</source>
-        <translation type="unfinished"/>
+        <translation>Exportation des certificats modifiés</translation>
    </message>
    <message>
        <source>The exported certificate is not the same as the one in use. Do you want to export the current certificate?</source>
-        <translation type="unfinished"/>
+        <translation>Le certificat exporté est différent de celui en cours d&apos;utilisation. Voulez-vous exporter le certificat actuel ?</translation>
    </message>
    <message>
        <source>Signer:</source>
-        <translation type="unfinished"/>
+        <translation>Signataire :</translation>
    </message>
 </context>
 <context>
@ -5140,7 +5141,7 @@ Commandes disponibles :
    </message>
    <message>
        <source>We cannot verify the source of the shared container because it is not signed. Do you really want to import from %1?</source>
-        <translation type="unfinished"/>
+        <translation>Nous ne pouvons vérifier la source du conteneur partagé car celui-ci n&apos;est pas signé. Êtes-vous sûr de vouloir importer depuis %1 ?</translation>
    </message>
    <message>
        <source>Import from container with certificate</source>
@ -5176,7 +5177,7 @@ Commandes disponibles :
    </message>
    <message>
        <source>Signed share container are not supported - import prevented</source>
-        <translation type="unfinished"/>
+        <translation>Conteneur de partage signé non pris en charge - importation annulée</translation>
    </message>
    <message>
        <source>File is not readable</source>
@ -5184,15 +5185,15 @@ Commandes disponibles :
    </message>
    <message>
        <source>Invalid sharing container</source>
-        <translation type="unfinished"/>
+        <translation>Conteneur de partage invalide</translation>
    </message>
    <message>
        <source>Untrusted import prevented</source>
-        <translation type="unfinished"/>
+        <translation>Importation non sécurisée annulée</translation>
    </message>
    <message>
        <source>Successful signed import</source>
-        <translation type="unfinished"/>
+        <translation>Importation signée réussie</translation>
    </message>
    <message>
        <source>Unexpected error</source>
@ -5200,11 +5201,11 @@ Commandes disponibles :
    </message>
    <message>
        <source>Unsigned share container are not supported - import prevented</source>
-        <translation type="unfinished"/>
+        <translation>Conteneur de partage non signé non pris en charge - importation annulée</translation>
    </message>
    <message>
        <source>Successful unsigned import</source>
-        <translation type="unfinished"/>
+        <translation>Importation non signée réussie</translation>
    </message>
    <message>
        <source>File does not exist</source>
@ -5212,27 +5213,27 @@ Commandes disponibles :
    </message>
    <message>
        <source>Unknown share container type</source>
-        <translation type="unfinished"/>
+        <translation>Type de conteneur de partage non reconnu</translation>
    </message>
    <message>
        <source>Overwriting signed share container is not supported - export prevented</source>
-        <translation type="unfinished"/>
+        <translation>Remplacement de conteneur de partage signé non pris en charge - exportation annulée</translation>
    </message>
    <message>
        <source>Could not write export container (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;exporter le conteneur (%1)</translation>
    </message>
    <message>
        <source>Overwriting unsigned share container is not supported - export prevented</source>
-        <translation type="unfinished"/>
+        <translation>Remplacement de conteneur non signé non pris en charge - exportation annulée</translation>
    </message>
    <message>
        <source>Could not write export container</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;exporter le conteneur</translation>
    </message>
    <message>
        <source>Unexpected export error occurred</source>
-        <translation type="unfinished"/>
+        <translation>Une erreur inattendue est survenue lors de l&apos;exportation</translation>
    </message>
    <message>
        <source>Export to %1 failed (%2)</source>
@ -5248,31 +5249,31 @@ Commandes disponibles :
    </message>
    <message>
        <source>Do you want to trust %1 with the fingerprint of %2 from %3?</source>
-        <translation type="unfinished"/>
+        <translation>Voulez-vous autoriser %1 avec l&apos;empreinte de %2 à %3 ? {1 ?} {2 ?}</translation>
    </message>
    <message>
        <source>Multiple import source path to %1 in %2</source>
-        <translation type="unfinished"/>
+        <translation>Chemin source d&apos;importation multiple de %1 dans %2</translation>
    </message>
    <message>
        <source>Conflicting export target path %1 in %2</source>
-        <translation type="unfinished"/>
+        <translation>Conflit du chemin cible d&apos;exportation %1 dans %2</translation>
    </message>
    <message>
        <source>Could not embed signature: Could not open file to write (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;intégrer la signature : le fichier (%1) n&apos;a pas pu être ouvert en écriture</translation>
    </message>
    <message>
        <source>Could not embed signature: Could not write file (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;intégrer la signature : problème d&apos;écriture dans le fichier (%1)</translation>
    </message>
    <message>
        <source>Could not embed database: Could not open file to write (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;intégrer la base de données : le fichier (%1) n&apos;a pas pu être ouvert en écriture</translation>
    </message>
    <message>
        <source>Could not embed database: Could not write file (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Impossible d&apos;intégrer la base de données : problème d&apos;écriture dans le fichier (%1)</translation>
    </message>
 </context>
 <context>
--- a/share/translations/keepassx_it.ts
+++ b/share/translations/keepassx_it.ts
@ -54,7 +54,7 @@
    </message>
    <message>
        <source>Use OpenSSH for Windows instead of Pageant</source>
-        <translation type="unfinished"/>
+        <translation>Usa OpenSSH per Windows al posto di Pageant</translation>
    </message>
 </context>
 <context>
@ -442,7 +442,8 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
    <message>
        <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation type="unfinished"/>
+        <translation>C&apos;è più di un database aperto
+Selezionare il database corretto dove salvare le credenziali</translation>
    </message>
 </context>
 <context>
@ -1341,7 +1342,9 @@ Se continui con questo numero, il tuo database potrebbe essere decifrato molto f
        <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>ATTENZIONE! Non è stata impostata una password. Utilizzare un database senza password è fortemente sconsigliato!
+
+Siete sicuri di voler continuare senza password?</translation>
    </message>
    <message>
        <source>Unknown error</source>
@ -1547,7 +1550,8 @@ Vuoi salvare le modifiche?</translation>
    <message>
        <source>Database was modified.
 Save changes?</source>
-        <translation type="unfinished"/>
+        <translation>Il database è stato modificato.
+Salvare le modifiche?</translation>
    </message>
    <message>
        <source>Save changes?</source>
@ -3532,7 +3536,7 @@ Si consiglia di utilizzare l&apos;AppImage disponibile sulla nostra pagina di do
    </message>
    <message>
        <source>Check for Updates...</source>
-        <translation type="unfinished"/>
+        <translation>Controllo aggiornamenti...</translation>
    </message>
    <message>
        <source>Share entry</source>
@ -3545,15 +3549,15 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Check for updates on startup?</source>
-        <translation type="unfinished"/>
+        <translation>Controllare gli aggiornamenti all&apos;avvio?</translation>
    </message>
    <message>
        <source>Would you like KeePassXC to check for updates on startup?</source>
-        <translation type="unfinished"/>
+        <translation>Volete che KeePassXC controlli eventuali aggiornamenti all&apos;avvio?</translation>
    </message>
    <message>
        <source>You can always check for updates manually from the application menu.</source>
-        <translation type="unfinished"/>
+        <translation>È sempre possibile controllare gli aggiornamenti manualmente tramite i menu dell&apos;applicazione.</translation>
    </message>
 </context>
 <context>
@ -3619,7 +3623,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    <name>NewDatabaseWizard</name>
    <message>
        <source>Create a new KeePassXC database...</source>
-        <translation type="unfinished"/>
+        <translation>Creazione di un nuovo database KeePassXC...</translation>
    </message>
    <message>
        <source>Root</source>
@ -3639,7 +3643,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation type="unfinished"/>
+        <translation>Qui è possibile modificare le impostazioni di crittaggio del database. È sempre possibile modificarli dopo nelle impostazioni del database.</translation>
    </message>
    <message>
        <source>Advanced Settings</source>
@ -3658,7 +3662,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation type="unfinished"/>
+        <translation>Qui è possibile modificare le impostazioni di crittaggio del database. È sempre possibile modificarli dopo nelle impostazioni del database.</translation>
    </message>
 </context>
 <context>
@ -3669,7 +3673,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>A master key known only to you protects your database.</source>
-        <translation type="unfinished"/>
+        <translation>Una password principale segreta protegge il vostro database.</translation>
    </message>
 </context>
 <context>
@ -3798,7 +3802,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>&lt;p&gt;A password is the primary method for securing your database.&lt;/p&gt;&lt;p&gt;Good passwords are long and unique. KeePassXC can generate one for you.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Una password è il metodo principale per mantenere sicuro il vostro database.&lt;/p&gt;&lt;p&gt;Una buona password dev&apos;essere lunga ed unica. KeePassXC può generarne una per voi.&lt;/p&gt;</translation>
    </message>
    <message>
        <source>Passwords do not match.</source>
@ -3958,7 +3962,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>{[(</source>
-        <translation type="unfinished"/>
+        <translation>{[(</translation>
    </message>
    <message>
        <source>Punctuation</source>
@ -3966,7 +3970,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>.,:;</source>
-        <translation type="unfinished"/>
+        <translation>.,:;</translation>
    </message>
    <message>
        <source>Quotes</source>
@ -3974,7 +3978,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>&quot; &apos;</source>
-        <translation type="unfinished"/>
+        <translation>&quot; &apos;</translation>
    </message>
    <message>
        <source>Math</source>
@ -3982,7 +3986,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>&lt;*+!?=</source>
-        <translation type="unfinished"/>
+        <translation>&lt;*+!?=</translation>
    </message>
    <message>
        <source>Dashes</source>
@ -3990,7 +3994,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>\_|-/</source>
-        <translation type="unfinished"/>
+        <translation>\_|-/</translation>
    </message>
    <message>
        <source>Logograms</source>
@ -3998,7 +4002,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>#$%&amp;&amp;@^`~</source>
-        <translation type="unfinished"/>
+        <translation>#$%&amp;&amp;@^`~</translation>
    </message>
    <message>
        <source>Switch to simple mode</source>
@ -4041,21 +4045,21 @@ Expect some bugs and minor issues, this version is not meant for production use.
    <name>QApplication</name>
    <message>
        <source>KeeShare</source>
-        <translation type="unfinished"/>
+        <translation>KeeShare</translation>
    </message>
 </context>
 <context>
    <name>QFileDialog</name>
    <message>
        <source>Select</source>
-        <translation type="unfinished"/>
+        <translation>Seleziona</translation>
    </message>
 </context>
 <context>
    <name>QMessageBox</name>
    <message>
        <source>Overwrite</source>
-        <translation type="unfinished"/>
+        <translation>Sovrascrivi</translation>
    </message>
    <message>
        <source>Delete</source>
@ -4063,11 +4067,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Move</source>
-        <translation type="unfinished"/>
+        <translation>Sposta</translation>
    </message>
    <message>
        <source>Empty</source>
-        <translation type="unfinished"/>
+        <translation>Vuoto</translation>
    </message>
    <message>
        <source>Remove</source>
@ -4075,7 +4079,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Skip</source>
-        <translation type="unfinished"/>
+        <translation>Salta</translation>
    </message>
    <message>
        <source>Disable</source>
@ -4083,7 +4087,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Merge</source>
-        <translation type="unfinished"/>
+        <translation>Incorpora</translation>
    </message>
 </context>
 <context>
@ -4743,19 +4747,19 @@ Comandi disponibili:
    </message>
    <message>
        <source>Create a new database.</source>
-        <translation type="unfinished"/>
+        <translation>Crea un nuovo database.</translation>
    </message>
    <message>
        <source>File %1 already exists.</source>
-        <translation type="unfinished"/>
+        <translation>Il file %1 esiste già.</translation>
    </message>
    <message>
        <source>Loading the key file failed</source>
-        <translation type="unfinished"/>
+        <translation>Caricamento del key-file fallito.</translation>
    </message>
    <message>
        <source>No key is set. Aborting database creation.</source>
-        <translation type="unfinished"/>
+        <translation>Chiave non impostata. Annullamento creazione database.</translation>
    </message>
    <message>
        <source>Failed to save the database: %1.</source>
@ -4763,7 +4767,7 @@ Comandi disponibili:
    </message>
    <message>
        <source>Successfully created new database.</source>
-        <translation type="unfinished"/>
+        <translation>Nuovo database creato con successo.</translation>
    </message>
    <message>
        <source>Insert password to encrypt database (Press enter to leave blank): </source>
--- a/share/translations/keepassx_pt_BR.ts
+++ b/share/translations/keepassx_pt_BR.ts
@ -491,7 +491,7 @@ Por favor, selecione o banco de dados correto para salvar as credenciais.</trans
    </message>
    <message>
        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Pe&amp;dir para desbloquear a base de dados se estiver bloqueada</translation>
+        <translation>Pe&amp;dir para desbloquear a banco de dados se estiver bloqueado</translation>
    </message>
    <message>
        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
@ -1063,7 +1063,7 @@ Isso pode impedir a conexão com o plugin do navegador.</translation>
    </message>
    <message numerus="yes">
        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Removido com sucesso% n chave (s) criptográficas das configurações do KeePassXC.</numerusform><numerusform>Removido com sucesso% n chave (s) criptográficas das configurações do KeePassXC.</numerusform></translation>
    </message>
    <message>
        <source>Forget all site-specific settings on entries</source>
@ -1097,7 +1097,7 @@ Permissões para acessar entradas serão revogadas.</translation>
    </message>
    <message>
        <source>The active database does not contain an entry with permissions.</source>
-        <translation>A base de dados ativa não contém uma entrada com permissões.</translation>
+        <translation>O banco de dados ativo não contém uma entrada com permissões.</translation>
    </message>
    <message>
        <source>Move KeePassHTTP attributes to custom data</source>
@ -1239,7 +1239,7 @@ Se você manter este número, seu banco de dados pode ser facilmente crackeado!<
    <message numerus="yes">
        <source> thread(s)</source>
        <comment>Threads for parallel execution (KDF settings)</comment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>processo(s)</numerusform><numerusform>processo(s)</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>%1 ms</source>
@ -1489,11 +1489,11 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
    </message>
    <message>
        <source>No current database.</source>
-        <translation>Nenhuma base de dados atual.</translation>
+        <translation>Nenhuma banco de dados atual.</translation>
    </message>
    <message>
        <source>No source database, nothing to do.</source>
-        <translation>Nenhuma base de dados de origem, nada a fazer.</translation>
+        <translation>Nenhuma banco de dados de origem, nada a fazer.</translation>
    </message>
    <message>
        <source>Search Results (%1)</source>
@ -1509,7 +1509,7 @@ Este é definitivamente um bug, por favor denuncie para os desenvolvedores.</tra
    </message>
    <message>
        <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>A base de dados foi alterada. Deseja carregar as alterações?</translation>
+        <translation>O banco de dados foi alterado. Deseja carregar as alterações?</translation>
    </message>
    <message>
        <source>Merge Request</source>
@ -1531,7 +1531,7 @@ Você deseja combinar suas alterações?</translation>
    </message>
    <message numerus="yes">
        <source>Do you really want to delete %n entry(s) for good?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Você realmente quer apagar %n entrada(s) para o bem?</numerusform><numerusform>Você realmente quer apagar %n entrada(s) para o bem?</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>Delete entry(s)?</source>
@ -1609,7 +1609,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
    </message>
    <message numerus="yes">
        <source>Entry &quot;%1&quot; has %2 reference(s). Do you want to overwrite references with values, skip this entry, or delete anyway?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>A entrada &quot;%1&quot; tem %2 referência(s). Deseja substituir referências por valores, ignorar essa entrada ou excluir mesmo assim?</numerusform><numerusform>A entrada &quot;%1&quot; tem %2 referência(s). Deseja substituir referências por valores, ignorar essa entrada ou excluir mesmo assim?</numerusform></translation>
    </message>
    <message>
        <source>Delete group</source>
@ -2078,15 +2078,15 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
    </message>
    <message>
        <source>The export container %1 is already referenced.</source>
-        <translation type="unfinished"/>
+        <translation>O contêiner de exportado %1 já é referenciado.</translation>
    </message>
    <message>
        <source>The import container %1 is already imported.</source>
-        <translation type="unfinished"/>
+        <translation>O contêiner de importado %1 já foi importado.</translation>
    </message>
    <message>
        <source>The container %1 imported and export by different groups.</source>
-        <translation type="unfinished"/>
+        <translation>O contêiner %1 importado e exportado por diferentes grupos.</translation>
    </message>
 </context>
 <context>
@ -2168,7 +2168,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
    </message>
    <message>
        <source>Hint: You can enable DuckDuckGo as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
+        <translation>Dica: você pode habilitar o DuckDuckGo como um reserva em Ferramentas&gt; Configurações&gt; Segurança</translation>
    </message>
    <message>
        <source>Select Image(s)</source>
@ -2184,7 +2184,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
    </message>
    <message numerus="yes">
        <source>%n icon(s) already exist in the database</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n ícone(s) já existe no banco de dados</numerusform><numerusform>%n ícone(s) já existe no banco de dados</numerusform></translation>
    </message>
    <message numerus="yes">
        <source>The following icon(s) failed:</source>
@ -2192,7 +2192,7 @@ Deseja desabilitar salvamento seguro e tentar novamente?</translation>
    </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>Este ícone é usado por %n entrada(s) e será substituído pelo ícone padrão. Tem certeza de que deseja excluí-lo?</numerusform><numerusform>Este ícone é usado por %n entrada(s) e será substituído pelo ícone padrão. Tem certeza de que deseja excluí-lo?</numerusform></translation>
    </message>
 </context>
 <context>
@ -2593,7 +2593,7 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
    </message>
    <message>
        <source>Wrong key or database file is corrupt.</source>
-        <translation>Chave errada ou base de dados corrompida.</translation>
+        <translation>Chave errada ou banco de dados corrompido.</translation>
    </message>
    <message>
        <source>missing database headers</source>
@ -2601,7 +2601,7 @@ Isto pode causar mal funcionamento dos plugins afetados.</translation>
    </message>
    <message>
        <source>Header doesn&apos;t match hash</source>
-        <translation type="unfinished"/>
+        <translation>Cabeçalho não corresponde ao hash</translation>
    </message>
    <message>
        <source>Invalid header id size</source>
@ -2833,7 +2833,7 @@ Isto é uma migração de caminho único. Você não poderá abrir o banco de da
    </message>
    <message>
        <source>Unable to parse UUID: %1</source>
-        <translation type="unfinished"/>
+        <translation>Não é possível analisar o UUID: %1</translation>
    </message>
    <message>
        <source>Failed to read database file.</source>
@ -3036,7 +3036,7 @@ Linha %2, coluna %3</translation>
    </message>
    <message>
        <source>Wrong key or database file is corrupt.</source>
-        <translation>Chave errada ou base de dados corrompida.</translation>
+        <translation>Chave errada ou banco de dados corrompido.</translation>
    </message>
    <message>
        <source>Key transformation failed</source>
@ -3225,7 +3225,7 @@ Linha %2, coluna %3</translation>
    </message>
    <message>
        <source>&lt;p&gt;You can add a key file containing random bytes for additional security.&lt;/p&gt;&lt;p&gt;You must keep it secret and never lose it or you will be locked out!&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Você pode adicionar um arquivo de chave contendo bytes aleatórios para segurança adicional.&lt;/p&gt;&lt;p&gt;Você deve mantê-lo em segredo e nunca perdê-lo ou você será bloqueado!&lt;/p&gt;</translation>
    </message>
    <message>
        <source>Legacy key file format</source>
@ -3236,12 +3236,16 @@ Linha %2, coluna %3</translation>
 unsupported in the future.

 Please go to the master key settings and generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>Você está usando um formato de arquivo de chave antigo que pode ficar
+sem suporte no futuro.
+
+Por favor, vá para as configurações da chave mestra e gere um novo arquivo de chave.</translation>
    </message>
    <message>
        <source>Error loading the key file '%1'
 Message: %2</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao carregar o arquivo de chave &apos;%1&apos;
+Mensagem: %2</translation>
    </message>
    <message>
        <source>Key files</source>
@ -3261,7 +3265,7 @@ Message: %2</source>
    </message>
    <message>
        <source>Unable to create key file: %1</source>
-        <translation type="unfinished"/>
+        <translation>Não foi possível criar arquivo de chave: %1</translation>
    </message>
    <message>
        <source>Select a key file</source>
@ -3308,11 +3312,11 @@ Message: %2</source>
    </message>
    <message>
        <source>&amp;Save database</source>
-        <translation>&amp;Salvar base de dados</translation>
+        <translation>&amp;Salvar banco de dados</translation>
    </message>
    <message>
        <source>&amp;Close database</source>
-        <translation>&amp;Fechar base de dados</translation>
+        <translation>&amp;Fechar banco de dados</translation>
    </message>
    <message>
        <source>&amp;Delete entry</source>
@ -3360,7 +3364,7 @@ Message: %2</source>
    </message>
    <message>
        <source>&amp;Lock databases</source>
-        <translation>&amp;Trancar base de dados</translation>
+        <translation>&amp;Trancar banco de dados</translation>
    </message>
    <message>
        <source>&amp;Title</source>
@ -3591,11 +3595,11 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </message>
    <message>
        <source>Adding backup for older target %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Adicionando backup para o alvo mais antigo %1 [%2]</translation>
    </message>
    <message>
        <source>Adding backup for older source %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Adicionando backup para fonte mais antiga %1 [%2]</translation>
    </message>
    <message>
        <source>Reapplying older target entry on top of newer source %1 [%2]</source>
@ -3607,7 +3611,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </message>
    <message>
        <source>Synchronizing from newer source %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Sincronizando de uma fonte mais nova %1 [%2]</translation>
    </message>
    <message>
        <source>Synchronizing from older source %1 [%2]</source>
@ -3619,7 +3623,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </message>
    <message>
        <source>Deleting orphan %1 [%2]</source>
-        <translation type="unfinished"/>
+        <translation>Excluindo órfã %1 [%2]</translation>
    </message>
    <message>
        <source>Changed deleted objects</source>
@ -3937,7 +3941,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </message>
    <message>
        <source>ExtendedASCII</source>
-        <translation type="unfinished"/>
+        <translation>ASCIIEstendido</translation>
    </message>
    <message>
        <source>Switch to advanced mode</source>
@ -3957,7 +3961,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </message>
    <message>
        <source>Lower Case Letters A to F</source>
-        <translation type="unfinished"/>
+        <translation>Letras minúsculas de A a F</translation>
    </message>
    <message>
        <source>a-z</source>
@ -4033,7 +4037,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </message>
    <message>
        <source>Add non-hex letters to &quot;do not include&quot; list</source>
-        <translation type="unfinished"/>
+        <translation>Adicionar letras não hexadecimais à lista &quot;não incluir&quot;</translation>
    </message>
    <message>
        <source>Hex</source>
@ -4041,7 +4045,7 @@ Espere alguns bugs e problemas menores, esta versão não é para uso em produç
    </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"/>
+        <translation>Caracteres excluídos: &quot;0&quot;, &quot;1&quot;, &quot;l&quot;, &quot;I&quot;, &quot;O&quot;, &quot;|&quot;, &quot;﹒&quot;</translation>
    </message>
    <message>
        <source>Word Co&amp;unt:</source>
@ -4415,11 +4419,11 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Invalid value for password length %1.</source>
-        <translation type="unfinished"/>
+        <translation>Valor inválido para o tamanho da senha %1.</translation>
    </message>
    <message>
        <source>Could not create entry with path %1.</source>
-        <translation type="unfinished"/>
+        <translation>Não foi possível criar uma entrada com o caminho %1.</translation>
    </message>
    <message>
        <source>Enter password for new entry: </source>
@ -4427,15 +4431,15 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Writing the database failed %1.</source>
-        <translation type="unfinished"/>
+        <translation>Gravação do banco de dados falhou %1.</translation>
    </message>
    <message>
        <source>Successfully added entry %1.</source>
-        <translation type="unfinished"/>
+        <translation>Entrada adicionada com sucesso %1.</translation>
    </message>
    <message>
        <source>Copy the current TOTP to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Copie o TOTP atual para a área de transferência.</translation>
    </message>
    <message>
        <source>Invalid timeout value %1.</source>
@ -4516,11 +4520,11 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Type: Bruteforce</source>
-        <translation type="unfinished"/>
+        <translation>Tipo: Força Bruta</translation>
    </message>
    <message>
        <source>Type: Dictionary</source>
-        <translation type="unfinished"/>
+        <translation>Tipo: Dicionário</translation>
    </message>
    <message>
        <source>Type: Dict+Leet</source>
@ -4540,15 +4544,15 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Type: Sequence</source>
-        <translation type="unfinished"/>
+        <translation>Tipo: Sequência</translation>
    </message>
    <message>
        <source>Type: Spatial</source>
-        <translation type="unfinished"/>
+        <translation>Tipo: Espacial</translation>
    </message>
    <message>
        <source>Type: Date</source>
-        <translation type="unfinished"/>
+        <translation>Tipo: Data</translation>
    </message>
    <message>
        <source>Type: Bruteforce(Rep)</source>
@ -4596,11 +4600,11 @@ Comandos disponíveis:
    </message>
    <message>
        <source>*** Password length (%1) != sum of length of parts (%2) ***</source>
-        <translation type="unfinished"/>
+        <translation>*** Comprimento da senha (%1) != soma do comprimento das partes (%2) ***</translation>
    </message>
    <message>
        <source>Failed to load key file %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Falha ao carregar o arquivo de chave %1: %2</translation>
    </message>
    <message>
        <source>File %1 does not exist.</source>
@ -4613,16 +4617,18 @@ Comandos disponíveis:
    <message>
        <source>Error while reading the database:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao ler o banco de dados:
+%1</translation>
    </message>
    <message>
        <source>Error while parsing the database:
 %1</source>
-        <translation type="unfinished"/>
+        <translation>Erro ao analisar o banco de dados:
+%1</translation>
    </message>
    <message>
        <source>Length of the generated password</source>
-        <translation type="unfinished"/>
+        <translation>Comprimento da senha gerada</translation>
    </message>
    <message>
        <source>Use lowercase characters</source>
@ -4646,11 +4652,11 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Exclude character set</source>
-        <translation type="unfinished"/>
+        <translation>Excluir conjunto de caracteres</translation>
    </message>
    <message>
        <source>chars</source>
-        <translation type="unfinished"/>
+        <translation>caracteres</translation>
    </message>
    <message>
        <source>Exclude similar looking characters</source>
@ -4666,7 +4672,7 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Cannot find group %1.</source>
-        <translation type="unfinished"/>
+        <translation>Não foi possível encontrar o grupo %1.</translation>
    </message>
    <message>
        <source>Error reading merge file:
@ -4691,19 +4697,19 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Show the entry&apos;s current TOTP.</source>
-        <translation type="unfinished"/>
+        <translation>Mostrar o TOTP atual da entrada.</translation>
    </message>
    <message>
        <source>ERROR: unknown attribute %1.</source>
-        <translation type="unfinished"/>
+        <translation>ERRO: atributo desconhecido %1.</translation>
    </message>
    <message>
        <source>No program defined for clipboard manipulation</source>
-        <translation type="unfinished"/>
+        <translation>Nenhum programa definido para manipulação da área de transferência</translation>
    </message>
    <message>
        <source>Unable to start program %1</source>
-        <translation type="unfinished"/>
+        <translation>Não é possível iniciar o programa %1</translation>
    </message>
    <message>
        <source>file empty</source>
@ -5268,7 +5274,7 @@ Comandos disponíveis:
    </message>
    <message>
        <source>Could not embed database: Could not write file (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Não foi possível incorporar o banco de dados: não foi possível gravar o arquivo (%1)</translation>
    </message>
 </context>
 <context>
--- a/share/translations/keepassx_ru.ts
+++ b/share/translations/keepassx_ru.ts
--- a/share/translations/keepassx_sv.ts
+++ b/share/translations/keepassx_sv.ts
@ -39,7 +39,7 @@
    </message>
    <message>
        <source>Project Maintainers:</source>
-        <translation>Projekt ansvariga:</translation>
+        <translation>Projektansvariga:</translation>
    </message>
    <message>
        <source>Special thanks from the KeePassXC team go to debfx for creating the original KeePassX.</source>
@ -220,7 +220,7 @@
    </message>
    <message>
        <source>Auto-Type typing delay</source>
-        <translation>Auto-skriv fördröjning</translation>
+        <translation>Fördröjning för auto-skriv</translation>
    </message>
    <message>
        <source> ms</source>
@ -765,7 +765,7 @@ Would you like to migrate your existing settings now?</source>
    </message>
    <message>
        <source>Number of headers line to discard</source>
-        <translation>Antal av rubrik rader att kasta bort</translation>
+        <translation>Antal rubrikrader att kasta bort</translation>
    </message>
    <message>
        <source>Consider &apos;\&apos; an escape character</source>
@ -1258,7 +1258,7 @@ If you keep this number, your database may be too easy to crack!</source>
    </message>
    <message>
        <source>Max. history items:</source>
-        <translation>Maxantal historik poster:</translation>
+        <translation>Maxantal historikposter:</translation>
    </message>
    <message>
        <source>Max. history size:</source>
@ -3856,7 +3856,7 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Word Separator:</source>
-        <translation>Ord separerare:</translation>
+        <translation>Ordseparerare:</translation>
    </message>
    <message>
        <source>Copy</source>
@ -4008,11 +4008,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Word Co&amp;unt:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Antal ord:</translation>
    </message>
    <message>
        <source>Regenerate</source>
-        <translation type="unfinished"/>
+        <translation>Regenerera</translation>
    </message>
 </context>
 <context>
--- a/share/translations/keepassx_tr.ts
+++ b/share/translations/keepassx_tr.ts
@ -73,7 +73,7 @@
    </message>
    <message>
        <source>Access error for config file %1</source>
-        <translation>%1 yapılandırma dosyası için erişim hatası</translation>
+        <translation>Yapılandırma dosyası erişim hatası %1</translation>
    </message>
    <message>
        <source>Icon only</source>
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.ts
@ -27,11 +27,11 @@
    </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>
@ -61,7 +61,7 @@
    <name>ApplicationSettingsWidget</name>
    <message>
        <source>Application Settings</source>
-        <translation>Налаштування застосунку</translation>
+        <translation>Налаштування програми</translation>
    </message>
    <message>
        <source>General</source>
@ -100,7 +100,7 @@
    <name>ApplicationSettingsWidgetGeneral</name>
    <message>
        <source>Basic Settings</source>
-        <translation>Базове налаштування</translation>
+        <translation>Основні налаштування</translation>
    </message>
    <message>
        <source>Startup</source>
@ -116,7 +116,7 @@
    </message>
    <message>
        <source>Remember last key files and security dongles</source>
-        <translation>Пам&apos;ятати останні файли ключів і механізми захисту</translation>
+        <translation>Пам&apos;ятати останні файли ключів та апаратні ключі</translation>
    </message>
    <message>
        <source>Load previous databases on startup</source>
@ -172,7 +172,7 @@
    </message>
    <message>
        <source>General</source>
-        <translation>Загальне</translation>
+        <translation>Загальні</translation>
    </message>
    <message>
        <source>Hide toolbar (icons)</source>
@ -1425,7 +1425,7 @@ Are you sure you want to continue without a password?</source>
        <source>The created database has no key or KDF, refusing to save it.
 This is definitely a bug, please report it to the developers.</source>
        <translation>Створене сховище не має ані ключа, ані ФОК, і тому не може бути збереженим.
-Це напевно вада у програмі. Будь ласка, повідомте про це розробникам.</translation>
+Це певно є вадою програми, будь ласка, повідомте про це розробникам.</translation>
    </message>
    <message>
        <source>The database file does not exist or is not accessible.</source>
@ -3564,8 +3564,8 @@ We recommend you use the AppImage available on our downloads page.</source>
    <message>
        <source>NOTE: You are using a pre-release version of KeePassXC!
 Expect some bugs and minor issues, this version is not meant for production use.</source>
-        <translation>&lt;b&gt;Примітка&lt;/b&gt;: Ви використовуєте попередню версію KeePassXC!
-Зважайте на можливість деяких вади та незначних проблем, ця версія не призначена для повсякденного користування.</translation>
+        <translation>&lt;b&gt;Примітка&lt;/b&gt;: Ви використовуєте попередній випуск KeePassXC!
+Зважайте на ймовірні помилки та незначні проблеми, ця версія не призначена для повсякденного користування.</translation>
    </message>
    <message>
        <source>Check for updates on startup?</source>
--- a/share/translations/keepassx_zh_CN.ts
+++ b/share/translations/keepassx_zh_CN.ts
@ -4672,7 +4672,7 @@ Available commands:
    </message>
    <message>
        <source>Cannot find group %1.</source>
-        <translation>找不到组%1。</translation>
+        <translation>找不到群组%1。</translation>
    </message>
    <message>
        <source>Error reading merge file:
@ -4760,7 +4760,7 @@ Available commands:
    </message>
    <message>
        <source>No groups found</source>
-        <translation>未找到组</translation>
+        <translation>未找到群组</translation>
    </message>
    <message>
        <source>Create a new database.</source>
--- a/share/translations/keepassx_zh_TW.ts
+++ b/share/translations/keepassx_zh_TW.ts
@ -54,7 +54,7 @@
    </message>
    <message>
        <source>Use OpenSSH for Windows instead of Pageant</source>
-        <translation type="unfinished"/>
+        <translation>使用 OpenSSH for Windows 而不是 Pageant</translation>
    </message>
 </context>
 <context>
@ -93,7 +93,7 @@
    </message>
    <message>
        <source>Follow style</source>
-        <translation type="unfinished"/>
+        <translation>遵照系統樣式</translation>
    </message>
 </context>
 <context>
@ -132,11 +132,11 @@
    </message>
    <message>
        <source>Safely save database files (may be incompatible with Dropbox, etc)</source>
-        <translation type="unfinished"/>
+        <translation>安全儲存資料庫檔案 (可能與 Dropbox 等服務不相容)</translation>
    </message>
    <message>
        <source>Backup database file before saving</source>
-        <translation type="unfinished"/>
+        <translation>儲存資料庫檔案前先備份</translation>
    </message>
    <message>
        <source>Automatically save after every change</source>
@ -168,7 +168,7 @@
    </message>
    <message>
        <source>Hide the entry preview panel</source>
-        <translation type="unfinished"/>
+        <translation>隱藏預覽項目區域</translation>
    </message>
    <message>
        <source>General</source>
@ -176,11 +176,11 @@
    </message>
    <message>
        <source>Hide toolbar (icons)</source>
-        <translation type="unfinished"/>
+        <translation>隱藏工具列 (圖示)</translation>
    </message>
    <message>
        <source>Minimize instead of app exit</source>
-        <translation type="unfinished"/>
+        <translation>以最小化取代關閉程式</translation>
    </message>
    <message>
        <source>Show a system tray icon</source>
@ -220,7 +220,7 @@
    </message>
    <message>
        <source>Auto-Type typing delay</source>
-        <translation type="unfinished"/>
+        <translation>自動輸入按鍵延遲</translation>
    </message>
    <message>
        <source> ms</source>
@ -229,23 +229,23 @@
    </message>
    <message>
        <source>Auto-Type start delay</source>
-        <translation type="unfinished"/>
+        <translation>自動輸入啟動延遲</translation>
    </message>
    <message>
        <source>Check for updates at application startup</source>
-        <translation type="unfinished"/>
+        <translation>程式啟動時檢查更新</translation>
    </message>
    <message>
        <source>Include pre-releases when checking for updates</source>
-        <translation type="unfinished"/>
+        <translation>檢查更新時包括預先發行版本</translation>
    </message>
    <message>
        <source>Movable toolbar</source>
-        <translation type="unfinished"/>
+        <translation>可移動的工具列</translation>
    </message>
    <message>
        <source>Button style</source>
-        <translation type="unfinished"/>
+        <translation>按鈕樣式</translation>
    </message>
 </context>
 <context>
@ -269,11 +269,11 @@
    </message>
    <message>
        <source> min</source>
-        <translation type="unfinished"/>
+        <translation>分鐘</translation>
    </message>
    <message>
        <source>Forget TouchID after inactivity of</source>
-        <translation type="unfinished"/>
+        <translation>遺忘 TouchID 當閒置</translation>
    </message>
    <message>
        <source>Convenience</source>
@ -285,7 +285,7 @@
    </message>
    <message>
        <source>Forget TouchID when session is locked or lid is closed</source>
-        <translation type="unfinished"/>
+        <translation>當工作階段鎖定或蓋上螢幕時遺忘 TouchID</translation>
    </message>
    <message>
        <source>Lock databases after minimizing the window</source>
@ -293,7 +293,7 @@
    </message>
    <message>
        <source>Re-lock previously locked database after performing Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>自動輸入後，將原本鎖定的資料庫重新鎖定</translation>
    </message>
    <message>
        <source>Don&apos;t require password repeat when it is visible</source>
@ -301,15 +301,15 @@
    </message>
    <message>
        <source>Don&apos;t hide passwords when editing them</source>
-        <translation type="unfinished"/>
+        <translation>編輯時不隱藏密碼</translation>
    </message>
    <message>
        <source>Don&apos;t use placeholder for empty password fields</source>
-        <translation type="unfinished"/>
+        <translation>不於空白密碼欄位處填入替代字符</translation>
    </message>
    <message>
        <source>Hide passwords in the entry preview panel</source>
-        <translation type="unfinished"/>
+        <translation>在項目預覽區內隱藏密碼</translation>
    </message>
    <message>
        <source>Hide entry notes by default</source>
@ -429,11 +429,11 @@ Please select whether you want to allow access.</source>
    <name>BrowserEntrySaveDialog</name>
    <message>
        <source>KeePassXC-Browser Save Entry</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC-Browser 瀏覽器擴充功能儲存項目</translation>
    </message>
    <message>
        <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>確定</translation>
    </message>
    <message>
        <source>Cancel</source>
@ -442,7 +442,8 @@ Please select whether you want to allow access.</source>
    <message>
        <source>You have multiple databases open.
 Please select the correct database for saving credentials.</source>
-        <translation type="unfinished"/>
+        <translation>您開啟了多個資料庫。
+請選擇您想要儲存憑證的資料庫。</translation>
    </message>
 </context>
 <context>
@ -589,11 +590,11 @@ Please select the correct database for saving credentials.</source>
    </message>
    <message>
        <source>&amp;Tor Browser</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tor 瀏覽器</translation>
    </message>
    <message>
        <source>&lt;b&gt;Warning&lt;/b&gt;, the keepassxc-proxy application was not found!&lt;br /&gt;Please check the KeePassXC installation directory or confirm the custom path in advanced options.&lt;br /&gt;Browser integration WILL NOT WORK without the proxy application.&lt;br /&gt;Expected Path: </source>
-        <translation type="unfinished"/>
+        <translation>&lt;b&gt;警告&lt;/b&gt;，找不到 keepassxc-proxy 應用程式！&lt;br /&gt;請檢查 KeePassXC 安裝目錄，或在進階選項中確認自定路徑。&lt;br /&gt;缺少此應用程式瀏覽器整合將無法運作。&lt;br /&gt;預期的路徑： </translation>
    </message>
    <message>
        <source>Executable Files</source>
@ -606,7 +607,7 @@ Please select the correct database for saving credentials.</source>
    <message>
        <source>Do not ask permission for HTTP &amp;Basic Auth</source>
        <extracomment>An extra HTTP Basic Auth setting</extracomment>
-        <translation type="unfinished"/>
+        <translation>不確認 HTTP 權限</translation>
    </message>
    <message>
        <source>Due to Snap sandboxing, you must run a script to enable browser integration.&lt;br /&gt;You can obtain this script from %1</source>
@ -618,7 +619,7 @@ Please select the correct database for saving credentials.</source>
    </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 type="unfinished"/>
+        <translation>需要 KeePassXC-Browser 瀏覽器擴充功能才能使用瀏覽器整合。為 %1 及 %2 下載。%3</translation>
    </message>
 </context>
 <context>
@ -883,7 +884,7 @@ Would you like to migrate your existing settings now?</source>
    <name>DatabaseOpenWidget</name>
    <message>
        <source>Enter master key</source>
-        <translation>輸入主金鑰</translation>
+        <translation>輸入主密碼</translation>
    </message>
    <message>
        <source>Key File:</source>
@ -972,7 +973,7 @@ Please consider generating a new key file.</source>
    </message>
    <message>
        <source>Master Key</source>
-        <translation type="unfinished"/>
+        <translation>主密碼</translation>
    </message>
    <message>
        <source>Encryption Settings</source>
@ -987,7 +988,7 @@ Please consider generating a new key file.</source>
    <name>DatabaseSettingsWidgetBrowser</name>
    <message>
        <source>KeePassXC-Browser settings</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC-Browser 瀏覽器擴充功能設定</translation>
    </message>
    <message>
        <source>&amp;Disconnect all browsers</source>
@ -995,7 +996,7 @@ Please consider generating a new key file.</source>
    </message>
    <message>
        <source>Forg&amp;et all site-specific settings on entries</source>
-        <translation type="unfinished"/>
+        <translation>遺忘目前項目中所有站台相關的設定 (&amp;e)</translation>
    </message>
    <message>
        <source>Move KeePassHTTP attributes to KeePassXC-Browser &amp;custom data</source>
@ -1032,7 +1033,7 @@ This may prevent connection to the browser plugin.</source>
    </message>
    <message>
        <source>Disconnect all browsers</source>
-        <translation type="unfinished"/>
+        <translation>與所有瀏覽器中斷連線</translation>
    </message>
    <message>
        <source>Do you really want to disconnect all browsers?
@ -1291,7 +1292,7 @@ If you keep this number, your database may be too easy to crack!</source>
    <name>DatabaseSettingsWidgetKeeShare</name>
    <message>
        <source>Sharing</source>
-        <translation type="unfinished"/>
+        <translation>分享</translation>
    </message>
    <message>
        <source>Breadcrumb</source>
@ -1299,11 +1300,11 @@ If you keep this number, your database may be too easy to crack!</source>
    </message>
    <message>
        <source>Type</source>
-        <translation type="unfinished"/>
+        <translation>種類</translation>
    </message>
    <message>
        <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>路徑</translation>
    </message>
    <message>
        <source>Last Signer</source>
@ -1311,12 +1312,12 @@ If you keep this number, your database may be too easy to crack!</source>
    </message>
    <message>
        <source>Certificates</source>
-        <translation type="unfinished"/>
+        <translation>憑證</translation>
    </message>
    <message>
        <source> &gt; </source>
        <comment>Breadcrumb separator</comment>
-        <translation type="unfinished"/>
+        <translation>&gt;</translation>
    </message>
 </context>
 <context>
@ -1335,13 +1336,15 @@ If you keep this number, your database may be too easy to crack!</source>
    </message>
    <message>
        <source>No password set</source>
-        <translation type="unfinished"/>
+        <translation>沒有設定密碼</translation>
    </message>
    <message>
        <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>警告！您尚未設定密碼。誠心建議不要使用不含密碼的資料庫檔案！
+
+您確定還是要在無密碼的情形下繼續？</translation>
    </message>
    <message>
        <source>Unknown error</source>
@ -1349,7 +1352,7 @@ Are you sure you want to continue without a password?</source>
    </message>
    <message>
        <source>Failed to change master key</source>
-        <translation type="unfinished"/>
+        <translation>更改主密碼失敗</translation>
    </message>
 </context>
 <context>
@ -1403,7 +1406,7 @@ Are you sure you want to continue without a password?</source>
    </message>
    <message>
        <source>Database creation error</source>
-        <translation type="unfinished"/>
+        <translation>資料庫建立錯誤</translation>
    </message>
    <message>
        <source>The created database has no key or KDF, refusing to save it.
@ -1425,17 +1428,17 @@ This is definitely a bug, please report it to the developers.</source>
    <message>
        <source>%1 [New Database]</source>
        <comment>Database tab name modifier</comment>
-        <translation type="unfinished"/>
+        <translation>%1 [新的資料庫]</translation>
    </message>
    <message>
        <source>%1 [Locked]</source>
        <comment>Database tab name modifier</comment>
-        <translation type="unfinished"/>
+        <translation>%1 [已鎖定]</translation>
    </message>
    <message>
        <source>%1 [Read-only]</source>
        <comment>Database tab name modifier</comment>
-        <translation type="unfinished"/>
+        <translation>%1 [唯讀]</translation>
    </message>
 </context>
 <context>
@ -1532,7 +1535,7 @@ Do you want to merge your changes?</source>
    </message>
    <message>
        <source>Lock Database?</source>
-        <translation type="unfinished"/>
+        <translation>鎖定資料庫？</translation>
    </message>
    <message>
        <source>You are editing an entry. Discard changes and lock anyway?</source>
@ -1547,7 +1550,8 @@ Save changes?</source>
    <message>
        <source>Database was modified.
 Save changes?</source>
-        <translation type="unfinished"/>
+        <translation>資料庫已修改。
+儲存變更？</translation>
    </message>
    <message>
        <source>Save changes?</source>
@ -1560,7 +1564,7 @@ Error: %1</source>
    </message>
    <message>
        <source>Disable safe saves?</source>
-        <translation>關閉安全存檔?</translation>
+        <translation>關閉安全存檔？</translation>
    </message>
    <message>
        <source>KeePassXC has failed to save the database multiple times. This is likely caused by file sync services holding a lock on the save file.
@ -2565,7 +2569,7 @@ This may cause the affected plugins to malfunction.</source>
    <name>Kdbx3Reader</name>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <translation>無法計算主密碼</translation>
    </message>
    <message>
        <source>Unable to issue challenge-response.</source>
@ -2604,7 +2608,7 @@ This may cause the affected plugins to malfunction.</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <translation>無法計算主密碼</translation>
    </message>
 </context>
 <context>
@ -2615,7 +2619,7 @@ This may cause the affected plugins to malfunction.</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <translation>無法計算主密碼</translation>
    </message>
    <message>
        <source>Invalid header checksum size</source>
@ -2743,7 +2747,7 @@ This may cause the affected plugins to malfunction.</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <translation>無法計算主密碼</translation>
    </message>
    <message>
        <source>Failed to serialize KDF parameters variant map</source>
@ -3010,7 +3014,7 @@ Line %2, column %3</source>
    </message>
    <message>
        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <translation>無法計算主密碼</translation>
    </message>
    <message>
        <source>Wrong key or database file is corrupt.</source>
@ -3174,17 +3178,17 @@ Line %2, column %3</source>
    <message>
        <source>Change %1</source>
        <comment>Change a key component</comment>
-        <translation type="unfinished"/>
+        <translation>更改%1</translation>
    </message>
    <message>
        <source>Remove %1</source>
        <comment>Remove a key component</comment>
-        <translation type="unfinished"/>
+        <translation>移除%1</translation>
    </message>
    <message>
        <source>%1 set, click to change or remove</source>
        <comment>Change or remove a key component</comment>
-        <translation type="unfinished"/>
+        <translation>%1已設定，點選以更改或移除</translation>
    </message>
 </context>
 <context>
@ -3214,7 +3218,9 @@ Line %2, column %3</source>
 unsupported in the future.

 Please go to the master key settings and generate a new key file.</source>
-        <translation type="unfinished"/>
+        <translation>你正在使用未來將不再支援的舊式金鑰檔案格式。
+
+請至主密碼設定產生新的金鑰。</translation>
    </message>
    <message>
        <source>Error loading the key file '%1'
@ -3414,11 +3420,11 @@ This version is not meant for production use.</source>
    </message>
    <message>
        <source>&amp;Donate</source>
-        <translation type="unfinished"/>
+        <translation>捐贈 (&amp;D)</translation>
    </message>
    <message>
        <source>Report a &amp;bug</source>
-        <translation type="unfinished"/>
+        <translation>回報錯誤 (&amp;b)</translation>
    </message>
    <message>
        <source>WARNING: Your Qt version may cause KeePassXC to crash with an On-Screen Keyboard!
@ -3427,75 +3433,75 @@ We recommend you use the AppImage available on our downloads page.</source>
    </message>
    <message>
        <source>&amp;Import</source>
-        <translation type="unfinished"/>
+        <translation>匯入 (&amp;I)</translation>
    </message>
    <message>
        <source>Copy att&amp;ribute...</source>
-        <translation type="unfinished"/>
+        <translation>複製屬性 (&amp;r)…</translation>
    </message>
    <message>
        <source>TOTP...</source>
-        <translation type="unfinished"/>
+        <translation>基於時間的一次性密碼算法…</translation>
    </message>
    <message>
        <source>&amp;New database...</source>
-        <translation type="unfinished"/>
+        <translation>新增資料庫(&amp;N)…</translation>
    </message>
    <message>
        <source>Create a new database</source>
-        <translation type="unfinished"/>
+        <translation>建立新資料庫</translation>
    </message>
    <message>
        <source>&amp;Merge from database...</source>
-        <translation type="unfinished"/>
+        <translation>與資料庫合併(&amp;M)…</translation>
    </message>
    <message>
        <source>Merge from another KDBX database</source>
-        <translation type="unfinished"/>
+        <translation>與其他 KDBX 資料庫合併</translation>
    </message>
    <message>
        <source>&amp;New entry</source>
-        <translation type="unfinished"/>
+        <translation>新增項目(&amp;N)</translation>
    </message>
    <message>
        <source>Add a new entry</source>
-        <translation type="unfinished"/>
+        <translation>添加新項目</translation>
    </message>
    <message>
        <source>&amp;Edit entry</source>
-        <translation type="unfinished"/>
+        <translation>編輯項目(&amp;E)</translation>
    </message>
    <message>
        <source>View or edit entry</source>
-        <translation type="unfinished"/>
+        <translation>檢視或編輯項目</translation>
    </message>
    <message>
        <source>&amp;New group</source>
-        <translation type="unfinished"/>
+        <translation>新增群組 (&amp;N)</translation>
    </message>
    <message>
        <source>Add a new group</source>
-        <translation type="unfinished"/>
+        <translation>添加新群組</translation>
    </message>
    <message>
        <source>Change master &amp;key...</source>
-        <translation type="unfinished"/>
+        <translation>更改主密碼(&amp;k)…</translation>
    </message>
    <message>
        <source>&amp;Database settings...</source>
-        <translation type="unfinished"/>
+        <translation>資料庫設定(&amp;D)…</translation>
    </message>
    <message>
        <source>Copy &amp;password</source>
-        <translation type="unfinished"/>
+        <translation>複製密碼(&amp;p)</translation>
    </message>
    <message>
        <source>Perform &amp;Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>進行自動輸入 (&amp;A)</translation>
    </message>
    <message>
        <source>Open &amp;URL</source>
-        <translation type="unfinished"/>
+        <translation>開啟網址(&amp;U)</translation>
    </message>
    <message>
        <source>KeePass 1 database...</source>
@ -3515,7 +3521,7 @@ We recommend you use the AppImage available on our downloads page.</source>
    </message>
    <message>
        <source>Show TOTP...</source>
-        <translation type="unfinished"/>
+        <translation>顯示 TOTP…</translation>
    </message>
    <message>
        <source>Show TOTP QR Code...</source>
@ -3626,11 +3632,11 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>En&amp;cryption Settings</source>
-        <translation type="unfinished"/>
+        <translation>加密設定 (&amp;c)</translation>
    </message>
    <message>
        <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation type="unfinished"/>
+        <translation>你可以在這裡調整資料庫加密設定。別擔心，你之後還能在資料庫設定中變更。</translation>
    </message>
    <message>
        <source>Advanced Settings</source>
@ -3649,18 +3655,18 @@ Expect some bugs and minor issues, this version is not meant for production use.
    </message>
    <message>
        <source>Here you can adjust the database encryption settings. Don&apos;t worry, you can change them later in the database settings.</source>
-        <translation type="unfinished"/>
+        <translation>你可以在這裡調整資料庫加密設定。別擔心，你之後還能在資料庫設定中變更。</translation>
    </message>
 </context>
 <context>
    <name>NewDatabaseWizardPageMasterKey</name>
    <message>
        <source>Database Master Key</source>
-        <translation type="unfinished"/>
+        <translation>資料庫主密碼</translation>
    </message>
    <message>
        <source>A master key known only to you protects your database.</source>
-        <translation type="unfinished"/>
+        <translation>只有你知道的密碼才能保護你的資料庫。</translation>
    </message>
 </context>
 <context>
@ -5047,7 +5053,7 @@ Available commands:
    </message>
    <message>
        <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>路徑</translation>
    </message>
    <message>
        <source>Status</source>
@ -5361,11 +5367,11 @@ Available commands:
    </message>
    <message>
        <source>Please try again later.</source>
-        <translation type="unfinished"/>
+        <translation>請稍後再試。</translation>
    </message>
    <message>
        <source>Software Update</source>
-        <translation type="unfinished"/>
+        <translation>軟體更新</translation>
    </message>
    <message>
        <source>A new version of KeePassXC is available!</source>
@ -5377,7 +5383,7 @@ Available commands:
    </message>
    <message>
        <source>Download it at keepassxc.org</source>
-        <translation type="unfinished"/>
+        <translation>在 keepassxc.org 下載</translation>
    </message>
    <message>
        <source>You&apos;re up-to-date!</source>
--- a/src/crypto/kdf/Argon2Kdf.cpp
+++ b/src/crypto/kdf/Argon2Kdf.cpp
@ -35,7 +35,7 @@ Argon2Kdf::Argon2Kdf()
    , m_memory(1 << 16)
    , m_parallelism(static_cast<quint32>(QThread::idealThreadCount()))
 {
-    m_rounds = 1;
+    m_rounds = 10;
 }

 quint32 Argon2Kdf::version() const
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@ -783,6 +783,9 @@ void DatabaseWidget::switchToMainView(bool previousDialogAccepted)
        }

        m_newParent = nullptr;
+    } else {
+        // Workaround: ensure entries are focused so search doesn't reset
+        m_entryView->setFocus();
    }

    setCurrentWidget(m_mainWidget);
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@ -268,6 +268,9 @@ MainWindow::MainWindow()
    m_ui->actionEntryCopyURL->setShortcutVisibleInContextMenu(true);
 #endif

+    connect(m_ui->menuEntries, SIGNAL(aboutToHide()), SLOT(releaseContextFocusLock()));
+    connect(m_ui->menuGroups, SIGNAL(aboutToHide()), SLOT(releaseContextFocusLock()));
+
    // Control window state
    new QShortcut(Qt::CTRL + Qt::Key_M, this, SLOT(showMinimized()));
    new QShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_M, this, SLOT(hideWindow()));
@ -560,8 +563,8 @@ void MainWindow::setMenuActionState(DatabaseWidget::Mode mode)
        switch (mode) {
        case DatabaseWidget::Mode::ViewMode: {
            // bool inSearch = dbWidget->isInSearchMode();
-            bool singleEntrySelected = dbWidget->numberOfSelectedEntries() == 1 && dbWidget->currentEntryHasFocus();
-            bool entriesSelected = dbWidget->numberOfSelectedEntries() > 0 && dbWidget->currentEntryHasFocus();
+            bool singleEntrySelected = dbWidget->numberOfSelectedEntries() == 1 && (m_contextMenuFocusLock || dbWidget->currentEntryHasFocus());
+            bool entriesSelected = dbWidget->numberOfSelectedEntries() > 0 && (m_contextMenuFocusLock || dbWidget->currentEntryHasFocus());
            bool groupSelected = dbWidget->isGroupSelected();
            bool recycleBinSelected = dbWidget->isRecycleBinSelected();

@ -894,7 +897,9 @@ void MainWindow::closeEvent(QCloseEvent* event)
        return;
    }

-    if (config()->get("GUI/MinimizeOnClose").toBool() && !m_appExitCalled) {
+    // Don't ignore close event when the app is hidden to tray.
+    // This can occur when the OS issues close events on shutdown.
+    if (config()->get("GUI/MinimizeOnClose").toBool() && !isHidden() && !m_appExitCalled) {
        event->ignore();
        hideWindow();
        return;
@ -1008,13 +1013,20 @@ void MainWindow::updateTrayIcon()
    }
 }

+void MainWindow::releaseContextFocusLock()
+{
+    m_contextMenuFocusLock = false;
+}
+
 void MainWindow::showEntryContextMenu(const QPoint& globalPos)
 {
+    m_contextMenuFocusLock = true;
    m_ui->menuEntries->popup(globalPos);
 }

 void MainWindow::showGroupContextMenu(const QPoint& globalPos)
 {
+    m_contextMenuFocusLock = true;
    m_ui->menuGroups->popup(globalPos);
 }

--- a/src/gui/MainWindow.h
+++ b/src/gui/MainWindow.h
@ -119,6 +119,7 @@ private slots:
    void selectPreviousDatabaseTab();
    void togglePasswordsHidden();
    void toggleUsernamesHidden();
+    void releaseContextFocusLock();

 private:
    static void setShortcut(QAction* action, QKeySequence::StandardKey standard, int fallback = 0);
@ -150,6 +151,7 @@ private:

    bool m_appExitCalled;
    bool m_appExiting;
+    bool m_contextMenuFocusLock;
    uint m_lastFocusOutTime;
    QTimer m_trayIconTriggerTimer;
    QSystemTrayIcon::ActivationReason m_trayIconTriggerReason;
--- a/src/gui/entry/EditEntryWidget.cpp
+++ b/src/gui/entry/EditEntryWidget.cpp
@ -962,6 +962,7 @@ void EditEntryWidget::cancel()
        m_entry->setIcon(Entry::DefaultIconNumber);
    }

+    bool accepted = false;
    if (isModified()) {
        auto result = MessageBox::question(this,
                                           QString(),
@ -969,18 +970,17 @@ void EditEntryWidget::cancel()
                                           MessageBox::Cancel | MessageBox::Save | MessageBox::Discard,
                                           MessageBox::Cancel);
        if (result == MessageBox::Cancel) {
-            m_mainUi->passwordGenerator->reset();
            return;
-        }
-        if (result == MessageBox::Save) {
-            commitEntry();
-            setModified(false);
+        } else if (result == MessageBox::Save) {
+            accepted = true;
+            if (!commitEntry()) {
+                return;
+            }
        }
    }

    clear();
-
-    emit editFinished(!isModified());
+    emit editFinished(accepted);
 }

 void EditEntryWidget::clear()
--- a/src/gui/entry/EntryView.cpp
+++ b/src/gui/entry/EntryView.cpp
@ -139,17 +139,18 @@ void EntryView::keyPressEvent(QKeyEvent* event)
    }

    int last = m_model->rowCount() - 1;
+    if (last > 0) {
+        if (event->key() == Qt::Key_Up && currentIndex().row() == 0) {
+            QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(last, 0));
+            setCurrentEntry(m_model->entryFromIndex(index));
+            return;
+        }

-    if (event->key() == Qt::Key_Up && currentIndex().row() == 0) {
-        QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(last, 0));
-        setCurrentEntry(m_model->entryFromIndex(index));
-        return;
-    }
-
-    if (event->key() == Qt::Key_Down && currentIndex().row() == last) {
-        QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(0, 0));
-        setCurrentEntry(m_model->entryFromIndex(index));
-        return;
+        if (event->key() == Qt::Key_Down && currentIndex().row() == last) {
+            QModelIndex index = m_sortModel->mapToSource(m_sortModel->index(0, 0));
+            setCurrentEntry(m_model->entryFromIndex(index));
+            return;
+        }
    }

    QTreeView::keyPressEvent(event);
--- a/src/gui/group/GroupView.cpp
+++ b/src/gui/group/GroupView.cpp
@ -72,6 +72,12 @@ void GroupView::dragMoveEvent(QDragMoveEvent* event)
    }
 }

+void GroupView::focusInEvent(QFocusEvent* event)
+{
+    emitGroupChanged();
+    QTreeView::focusInEvent(event);
+}
+
 Group* GroupView::currentGroup()
 {
    if (currentIndex() == QModelIndex()) {
--- a/src/gui/group/GroupView.h
+++ b/src/gui/group/GroupView.h
@ -47,6 +47,7 @@ private slots:

 protected:
    void dragMoveEvent(QDragMoveEvent* event) override;
+    void focusInEvent(QFocusEvent* event) override;

 private:
    void recInitExpanded(Group* group);
--- a/src/totp/totp.cpp
+++ b/src/totp/totp.cpp
@ -159,9 +159,9 @@ QString Totp::writeSettings(const QSharedPointer<Totp::Settings>& settings,
        auto urlstring = QString("otpauth://totp/%1:%2?secret=%3&period=%4&digits=%5&issuer=%1")
                             .arg(title.isEmpty() ? "KeePassXC" : QString(QUrl::toPercentEncoding(title)),
                                  username.isEmpty() ? "none" : QString(QUrl::toPercentEncoding(username)),
-                                  QString(Base32::sanitizeInput(settings->key.toLatin1())))
-                             .arg(settings->step)
-                             .arg(settings->digits);
+                                  QString(Base32::sanitizeInput(settings->key.toLatin1())),
+                                  QString::number(settings->step),
+                                  QString::number(settings->digits));

        if (!settings->encoder.name.isEmpty()) {
            urlstring.append("&encoder=").append(settings->encoder.name);