Update locale files and pull in latest translations

26 files changed, 57076 insertions, 14732 deletions

diff --git a/share/translations/keepassx_ca.ts b/share/translations/keepassx_ca.ts
index 8d837c563..f76ace243 100644
--- a/share/translations/keepassx_ca.ts
+++ b/share/translations/keepassx_ca.ts
@@ -3,21 +3,41 @@
     <name>AboutDialog</name>
     <message>
         <source>About KeePassXC</source>
-        <translation>Sobre KeePassXC</translation>
+        <translation>Quant al KeePassXC</translation>
     </message>
     <message>
         <source>About</source>
-        <translation>Sobre</translation>
+        <translation>Quant</translation>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Reportar errors a: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeepassXC es distribueix sota els termes de la Llicència Pública General GNU (GPL) versió 2 o (segons la vostra opció) versió 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Mantenidors del projecte:</translation>
     </message>
     <message>
         <source>Contributors</source>
         <translation>Contribuïdors</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Veure els contribuïdors a GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Informació de depuració</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Inclou la següent informació a l&apos;hora de reportar un error:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Copia al porta-retalls</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revisió: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribució: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Llibreries</translation>
     </message>
@@ -47,34 +71,14 @@ Nucli: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Extensions habilitades:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Reportar errors a: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeepassXC es distribueix sota els termes de la Llicència Pública General GNU (GPL) versió 2 o (segons la vostra opció) versió 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Mantenidors del projecte:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Veure els contribuïdors a GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Inclou la següent informació a l&apos;hora de reportar un error:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribució: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Confirmeu l&apos;accés</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Recorda aquesta decisió</translation>
     </message>
@@ -89,11 +93,15 @@ Nucli: %3 %4</translation>
     <message>
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation type="unfinished"/>
+        <translation>%1 ha demanat l&apos;accés a contrasenyes pels següents elements.
+Seleccioneu si voleu permetre l&apos;accés.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Confirmeu l&apos;accés</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -104,6 +112,26 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
+        <translation>Compleció automàtica - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Compleció automàtica</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -125,13 +153,290 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Compleció automàtica - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
+        <translation>Seleccione l&apos;entrada per a la compleció automàtica:</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
+        <source>Remember this decision</source>
+        <translation>Recorda aquesta decisió</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permet</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Denega</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 ha demanat l&apos;accés a contrasenyes pels següents elements.
+Seleccioneu si voleu permetre l&apos;accés.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diàleg</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Sol·licitar el desbloqueig de la base de dades si està blocada</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Només retorna les millors coincidències per a una adreça URL específica en lloc de totes les entrades per al domini.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançat</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Només s&apos;ha de connectar amb un client, la base de dades seleccionada.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>L&apos;actualització o creació de camps de test no està suportada.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Retorna camps avançats de text que comencen amb &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nova petició de associació de clau</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Voleu sobreescriure la clau existent?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Actualitza l&apos;entrada</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Voleu actualitzar la informació en %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Base de dades bloquejada!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>La base de dades activa està bloquejada!
+Per favor, desbloqueu  la base de dades seleccionada o escolliu-ne una altra.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: La configuració no està disponible!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No s&apos;han trobat claus</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Claus de la base de dades eliminades</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Abort</source>
+        <translation>Avorta</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permisos eliminats</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No s&apos;ha trobat cap entrada amb permisos!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de dades activa no conté cap entrada amb permisos.</translation>
+    </message>
 </context>
 <context>
     <name>ChangeMasterKeyWidget</name>
@@ -148,14 +453,26 @@ Please select whether you want to allow access.</source>
         <translation>Repetiu la contrasenya:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Arxiu clau</translation>
+    </message>
+    <message>
         <source>Browse</source>
-        <translation>Navegar</translation>
+        <translation>Navega</translation>
     </message>
     <message>
         <source>Create</source>
         <translation>Crea</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Pregunta/resposta</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Actualitza</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Fitxers de clau</translation>
     </message>
@@ -169,13 +486,17 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Unable to create Key File : </source>
-        <translation type="unfinished"/>
+        <translation>No s&apos;ha pogut de crear el fitxer clau: </translation>
     </message>
     <message>
         <source>Select a key file</source>
         <translation>Seleccioneu un arxiu clau</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Contrasenya buida</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Realment voleu utilitzar una cadena buida com a contrasenya?</translation>
     </message>
@@ -189,24 +510,19 @@ Please select whether you want to allow access.</source>
         <translation>No ha pogut definir %1 com a arxiu clau: %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Arxiu clau</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>L&apos;actualitza</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Contrasenya buida</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation type="unfinished"/>
+        <translation>Ha fallat el canvi de clau mestra: cap YubiKey inserida.</translation>
     </message>
 </context>
 <context>
@@ -216,6 +532,10 @@ Please select whether you want to allow access.</source>
         <translation>Clona les opcions</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Afegeix &apos;-clon&apos; al títol</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Substituir el nom d&apos;usuari i contrasenya amb referències</translation>
     </message>
@@ -223,10 +543,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>Còpia el historial</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Afegeix &apos;-clon&apos; al títol</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -284,7 +600,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Not present in CSV file</source>
-        <translation type="unfinished"/>
+        <translation>No apareix al fitxer CSV</translation>
     </message>
     <message>
         <source>Empty fieldname </source>
@@ -308,7 +624,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source> more messages skipped]</source>
-        <translation type="unfinished"/>
+        <translation> més missatges omesos]</translation>
     </message>
     <message>
         <source>Error</source>
@@ -317,16 +633,13 @@ Please select whether you want to allow access.</source>
     <message>
         <source>CSV import: writer has errors:
 </source>
-        <translation type="unfinished"/>
+        <translation>Importació CSV: el fitxer té errors:
+</translation>
     </message>
 </context>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -337,17 +650,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> byte, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> files, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> columnes</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -369,6 +682,14 @@ Please select whether you want to allow access.</source>
         <translation>Navega</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Actualitza</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Pregunta/resposta</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>No es pot obrir la base de dades.</translation>
     </message>
@@ -377,25 +698,32 @@ Please select whether you want to allow access.</source>
         <translation>No es pot obrir el fitxer de clau</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Tots els fitxers</translation>
     </message>
     <message>
         <source>Key files</source>
-        <translation>Arxius de clau</translation>
+        <translation>Fitxers de clau</translation>
     </message>
     <message>
         <source>Select key file</source>
         <translation>Seleccioneu el fitxer de clau</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualitza</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -412,21 +740,22 @@ Please select whether you want to allow access.</source>
         <translation>No es pot obrir el fitxer de clau</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>No es pot obrir la base de dades.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Base de dades oberta correctament.</translation>
+    </message>
+    <message>
         <source>Success</source>
-        <translation type="unfinished"/>
+        <translation>Completat amb èxit</translation>
     </message>
     <message>
         <source>The database has been successfully repaired
 You can now save it.</source>
-        <translation type="unfinished"/>
+        <translation>La base de dades ha estat reparada.
+ Ara es pot desar.</translation>
     </message>
     <message>
         <source>Unable to repair the database.</source>
@@ -436,40 +765,57 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nom de base de dades:</translation>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Descripció de la base de dades:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Usuari per defecte:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>N. max. d&apos;elements al historial:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Mida màx. del historial:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Utilitza la paperera</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -480,14 +826,78 @@ You can now save it.</source>
         <translation>Twofish: 256 bits</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritme:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Transformar rondes:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nom de base de dades:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descripció de la base de dades:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Usuari per defecte:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>N. max. d&apos;elements al historial:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Mida màx. del historial:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Utilitza la paperera</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Arrel</translation>
     </message>
     <message>
@@ -507,22 +917,48 @@ You can now save it.</source>
         <translation>No s&apos;ha trobat el fitxer!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Obre base de dades de KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>No es pot obrir la base de dades.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de dades de KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Arxiu obert en mode de només lectura.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Obre arxiu CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Fitxer CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Tots els arxius (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Fusiona la base de dades</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Obre base de dades de KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de dades de KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Voleu tancar?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; està en mode d&apos;edició.
+Voleu descartar els canvis i tancar de totes maneres?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Voleu desar els canvis?</translation>
     </message>
@@ -537,10 +973,22 @@ Voleu desar els canvis?</translation>
         <translation>Ha fallat l&apos;escriptura en la base de dades.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Contrasenyes</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Desa la base de dades com a</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Exporta la base de dades a un fitxer CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Ha fallat l&apos;escriptura al fitxer CSV.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nova base de dades</translation>
     </message>
@@ -559,12 +1007,6 @@ Please press cancel to finish your changes or discard them.</source>
 Per favor,  feu clic a cancel·la per a finalitzar els canvis o descarteu-los.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Aquesta base de dades no s&apos;ha desat.
-Podeu desar la base de dades o deixar de bloquejar-la.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -572,176 +1014,200 @@ Otherwise your changes are lost.</source>
 Voleu desar la base de dades abans de tancar-la?
 En cas contrari, es perderan els canvis.</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; està en mode d&apos;edició.
-Voleu descartar els canvis i tancar de totes maneres?</translation>
+        <source>Searching...</source>
+        <translation>Cercant...</translation>
     </message>
     <message>
-        <source>Export database to CSV file</source>
-        <translation>Exporta la base de dades a un fitxer CSV</translation>
+        <source>Change master key</source>
+        <translation>Canvia la clau mestra</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>Fitxer CSV</translation>
+        <source>Delete entry?</source>
+        <translation>Suprimir l&apos;entrada?</translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Ha fallat l&apos;escriptura al fitxer CSV.</translation>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation>Realment voleu suprimir l&apos;entrada &quot;%1&quot; per sempre?</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No es pot obrir la base de dades.</translation>
+        <source>Delete entries?</source>
+        <translation>Suprimir les entrades?</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Fusiona la base de dades</translation>
+        <source>Do you really want to delete %1 entries for good?</source>
+        <translation>Realment voleu suprimir %1 entrades per sempre?</translation>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>La base de dades que està intentant salvar està bloquejada per una altra instància de KeePassXC.
-Voleu desar-la igualment?</translation>
+        <source>Move entry to recycle bin?</source>
+        <translation>Moure l&apos;entrada a la Paperera?</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Contrasenyes</translation>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Realment voleu moure l&apos;entrada &quot;%1&quot; a la paperera?</translation>
     </message>
     <message>
-        <source>Database already opened</source>
-        <translation>La base de dades ja està oberta</translation>
+        <source>Move entries to recycle bin?</source>
+        <translation>Moure les entrades a la paperera?</translation>
     </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>La base de dades que està intentant obrir està bloquejada per una altra instància de KeePassXC.
-
-Voleu obrir-la igualment?</translation>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Open read-only</source>
-        <translation>Obre en mode només de lectura</translation>
+        <source>Execute command?</source>
+        <translation>Execute l&apos;ordre?</translation>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Arxiu obert en mode de només lectura.</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Voleu executar la següent ordre? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>Obre arxiu CSV</translation>
+        <source>Remember my choice</source>
+        <translation>Recordar la meva elecció</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseWidget</name>
     <message>
-        <source>Change master key</source>
-        <translation>Canvia la clau mestra</translation>
+        <source>Delete group?</source>
+        <translation>Voleu suprimir el grup?</translation>
     </message>
     <message>
-        <source>Delete entry?</source>
-        <translation>Suprimir l&apos;entrada?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Realment voleu suprimir el grup &quot;%1&quot; per sempre?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>Realment voleu suprimir l&apos;entrada &quot;%1&quot; per sempre?</translation>
+        <source>Unable to calculate master key</source>
+        <translation>No es pot calcular la clau mestra</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Suprimir les entrades?</translation>
+        <source>No current database.</source>
+        <translation>Cap base de dades actual.</translation>
     </message>
     <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Realment voleu suprimir %1 entrades per sempre?</translation>
+        <source>No source database, nothing to do.</source>
+        <translation>Cap base de dades, res a veure.</translation>
     </message>
     <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Moure les entrades a la paperera?</translation>
+        <source>Search Results (%1)</source>
+        <translation>Resultats de la cerca (%1)</translation>
     </message>
-    <message numerus="yes">
-        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Realment voleu moure %n entry(s) a la Paperera de reciclatge?</numerusform><numerusform>Realment voleu moure %n entrada(es) a la paperera?</numerusform></translation>
+    <message>
+        <source>No Results</source>
+        <translation>No hi ha resultats</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Voleu suprimir el grup?</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Realment voleu suprimir el grup &quot;%1&quot; per sempre?</translation>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation>El fitxer de base de dades ha canviat. Voleu carregar els canvis?</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No es pot calcular la clau mestra</translation>
+        <source>Merge Request</source>
+        <translation>Petició de combinació</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Moure l&apos;entrada a la Paperera?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Realment voleu moure l&apos;entrada &quot;%1&quot; a la paperera?</translation>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <translation>No s&apos;ha pogut obrir el nou fitxer de base de dades al intentar reobrir aquesta base de dades.</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Cercant...</translation>
+        <source>Empty recycle bin?</source>
+        <translation>Buida la paperera?</translation>
     </message>
     <message>
-        <source>No current database.</source>
-        <translation>Cap base de dades actual.</translation>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation>Esteu segur que voleu suprimir permanentment tot el contingut de la paperera?</translation>
     </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
     <message>
-        <source>No source database, nothing to do.</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search Results (%1)</source>
-        <translation>Resultats de la cerca (%1)</translation>
+        <source>Close</source>
+        <translation>Tanca</translation>
     </message>
     <message>
-        <source>No Results</source>
-        <translation>No hi ha resultats</translation>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Execute l&apos;ordre?</translation>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Voleu executar la següent ordre? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <source>URL</source>
+        <translation>URL</translation>
     </message>
     <message>
-        <source>Remember my choice</source>
-        <translation>Recordar la meva elecció</translation>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nom d&apos;usuari</translation>
     </message>
     <message>
-        <source>Autoreload Request</source>
-        <translation>Tona a carregar la petició</translation>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>El fitxer de base de dades ha canviat. Voleu carregar els canvis?</translation>
+        <source>Searching</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge Request</source>
+        <source>Attributes</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>El fitxer de base de dades ha canviat i té canvis no desats. Voleu combinar els canvis?</translation>
+        <source>Attachments</source>
+        <translation>Fitxers adjunts</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <source>Window</source>
+        <translation>Finestra</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Seqüència</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cerca</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Neteja</translation>
+    </message>
+    <message>
+        <source>Never</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
-        <translation>Buida la paperera?</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation>Esteu segur que voleu suprimir permanentment tot el contingut de la paperera?</translation>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -760,7 +1226,7 @@ Voleu obrir-la igualment?</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>Compleció automàtica</translation>
     </message>
     <message>
         <source>Properties</source>
@@ -771,6 +1237,30 @@ Voleu obrir-la igualment?</translation>
         <translation>Historial</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Historial de l&apos;entrada</translation>
     </message>
@@ -791,22 +1281,20 @@ Voleu obrir-la igualment?</translation>
         <translation>Nou atribut</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Seleccioneu el fitxer</translation>
+        <source>Confirm Remove</source>
+        <translation>Confirma la supressió</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>No es pot obrir el fitxer</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Esteu segur que voleu suprimir aquest atribut?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Deseu el fitxer adjunt</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>No es por desar l&apos;arxiu adjunt:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -814,32 +1302,16 @@ Voleu obrir-la igualment?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n setmanes</numerusform><numerusform>%n setmana(es)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mes (OS)</numerusform><numerusform>%n mes(os)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 any</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirma la supressió</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Esteu segur que voleu suprimir aquest atribut?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[PROTEGIT] Premeu revelar per veure o editar</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Esteu segur que voleu suprimir aquest fitxer adjunt?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -856,18 +1328,6 @@ Voleu obrir-la igualment?</translation>
         <translation>Suprimiu</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Fitxers adjunts</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Desa</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Obre</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Edita el nom</translation>
     </message>
@@ -879,12 +1339,28 @@ Voleu obrir-la igualment?</translation>
         <source>Reveal</source>
         <translation>Revela</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Fitxers adjunts</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Permetre la compleció automàtica per a aquesta entrada</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Hereta la seqüència de compleció automàtica per defecte de &amp;grup</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Utilitza la seqüència personalitzada per a la compleció automàtica:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Associacions de finestra</translation>
     </message>
     <message>
         <source>+</source>
@@ -899,24 +1375,12 @@ Voleu obrir-la igualment?</translation>
         <translation>Títol de la finestra:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
-        <translation type="unfinished"/>
+        <translation>Utilitza la se&amp;qüència per defecte a la compleció automàtica </translation>
     </message>
     <message>
         <source>Set custo&amp;m sequence:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Window Associations</source>
-        <translation type="unfinished"/>
+        <translation>Estableix una seqüència personalitzada per a la compleció automàtica :</translation>
     </message>
 </context>
 <context>
@@ -941,12 +1405,8 @@ Voleu obrir-la igualment?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Títol:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nom d&apos;usuari:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -957,20 +1417,104 @@ Voleu obrir-la igualment?</translation>
         <translation>Repeteix:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Títol:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expira</translation>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Configuracions</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notes:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nom d&apos;usuari:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copia al porta-retalls</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1028,20 +1572,28 @@ Voleu obrir-la igualment?</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>Compleció automàtica</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Utilitza seqüència per defecte del grup pare per a lacompleció automàtica</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation type="unfinished"/>
+        <translation>Estableix la se&amp;qüència per defecte per a la compleció automàtica</translation>
     </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Utilitzar icona per defecte</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Utilitza una icona personalitzada</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Afegeix una icona personalitzada</translation>
     </message>
@@ -1050,6 +1602,18 @@ Voleu obrir-la igualment?</translation>
         <translation>Suprimeix la icona personalitzada</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Descarregua el favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>No es pot descarregar el favicon.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Consell: Podeu activar Google com a recurs alternatiu a Eines &gt; Configuració &gt; Seguretat</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Imatges</translation>
     </message>
@@ -1062,24 +1626,12 @@ Voleu obrir-la igualment?</translation>
         <translation>Seleccioneu la imatge</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Descarregua el favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>No es pot descarregar el favicon.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>No es pot llegir la icona</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation type="unfinished"/>
+        <source>Custom icon already exists</source>
+        <translation>Ja existeix una icona personalitzada</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1089,14 +1641,6 @@ Voleu obrir-la igualment?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Aquesta icona s&apos;utilitza en %1 entrades i serà substituïda per la icona per defecte. Esteu segur que voleu suprimir-la?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Consell: Podeu activar Google com a recurs alternatiu a Eines &gt; Configuració &gt; Seguretat</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Ja existeix una icona personalitzada</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1121,10 +1665,94 @@ Voleu obrir-la igualment?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> -Clon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Afegiu</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Suprimiu</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Obre</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Desa</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirma la supressió</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1153,6 +1781,11 @@ Voleu obrir-la igualment?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -1168,11 +1801,6 @@ Voleu obrir-la igualment?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1182,6 +1810,17 @@ Voleu obrir-la igualment?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1213,517 +1852,1077 @@ Voleu obrir-la igualment?</translation>
     </message>
     <message>
         <source>0-9</source>
-        <translation type="unfinished"/>
+        <translation>0-9</translation>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation type="unfinished"/>
+        <translation>Caràcters especials</translation>
     </message>
     <message>
         <source>/*_&amp; ...</source>
-        <translation type="unfinished"/>
+        <translation>/*_&amp; ...</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
-        <translation type="unfinished"/>
+        <translation>Excloure caràcters d&apos;aspecte semblant</translation>
     </message>
     <message>
         <source>Ensure that the password contains characters from every group</source>
-        <translation type="unfinished"/>
+        <translation>Assegurar-se que la contrasenya conté caràcters de cada grup</translation>
     </message>
 </context>
 <context>
     <name>KMessageWidget</name>
     <message>
         <source>&amp;Close</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Tancar</translation>
     </message>
     <message>
         <source>Close message</source>
-        <translation type="unfinished"/>
+        <translation>Tancar missatge</translation>
     </message>
 </context>
 <context>
-    <name>KeePass1OpenWidget</name>
+    <name>Kdbx3Reader</name>
     <message>
-        <source>Import KeePass1 database</source>
-        <translation type="unfinished"/>
+        <source>Unable to calculate master key</source>
+        <translation>No es pot calcular la clau mestra</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>No es pot obrir la base de dades.</translation>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Incapaç d&apos;emetre pregunta-resposta.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Clau incorrecta o fitxer de base de dades corrupte.</translation>
     </message>
 </context>
 <context>
-    <name>KeePass1Reader</name>
+    <name>Kdbx3Writer</name>
     <message>
-        <source>Unable to read keyfile.</source>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Incapaç d&apos;emetre pregunta-resposta.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>No es pot calcular la clau mestra</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Not a KeePass database.</source>
+        <source>Unable to calculate master key</source>
+        <translation>No es pot calcular la clau mestra</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported encryption algorithm.</source>
+        <source>Header SHA256 mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Root</source>
-        <translation>Arrel</translation>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unable to calculate master key</source>
         <translation>No es pot calcular la clau mestra</translation>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KeePass2Reader</name>
+    <name>KdbxReader</name>
     <message>
-        <source>Not a KeePass database.</source>
+        <source>Invalid cipher uuid length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
+        <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
+        <source>Invalid compression flags length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No es pot calcular la clau mestra</translation>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>No és una base de dades KeePass.</translation>
+    </message>
+    <message>
         <source>The selected file is an old KeePass 1 database (.kdb).
 
 You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>El fitxer seleccionat és una base de dades KeePass 1 antiga (.kdb).
+
+Podeu importar-la fent clic a la base de dades &gt; &quot;importar base de dades KeePass 1...&quot;.
+Es tracta d&apos;una migració unidireccional. No obrir la base de dades importada amb la antiga versió KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KeePass2Writer</name>
+    <name>KdbxXmlReader</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>XML parsing failure: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No es pot calcular la clau mestra</translation>
+        <source>No root group</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Missing icon uuid or data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
+        <source>Missing custom data key or value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Multiple group elements</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Null group uuid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Invalid group icon number</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Obre la base de dades</translation>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
+        <source>Invalid EnableSearching value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
+        <source>No group uuid found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
+        <source>Null DeleteObject uuid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Missing DeletedObject uuid or time</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
+        <source>Null entry uuid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
+        <source>Invalid entry icon number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>History element in history entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de dades de KeePass 2</translation>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tots els fitxers</translation>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
+        <source>Unable to decrypt entry string</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Ha fallat l&apos;escriptura en la base de dades.</translation>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <source>Entry string key or value missing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <source>Duplicate attachment found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>Entry binary key or value missing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Groups</source>
+        <source>Auto-type association window or sequence missing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View</source>
+        <source>Invalid bool value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Quit</source>
+        <source>Invalid date time value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Invalid color value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Save database</source>
+        <source>Invalid color rgb part</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Close database</source>
+        <source>Invalid number value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;New database</source>
+        <source>Invalid uuid value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge from KeePassX database</source>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
     <message>
-        <source>&amp;Add new entry</source>
+        <source>Import KeePass1 database</source>
+        <translation>Importar base de dades KeePass1</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>No es pot obrir la base de dades.</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation>No es pot llegir el fitxer de claus.</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>No és una base de dades KeePass.</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation>Algoritme d&apos;encriptació no admès.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation>Versió de base de dades KeePass no admesa.</translation>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View/Edit entry</source>
+        <source>Invalid number of groups</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete entry</source>
+        <source>Invalid number of entries</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new group</source>
+        <source>Invalid content hash size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Edit group</source>
+        <source>Invalid transform seed size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete group</source>
+        <source>Invalid number of transform rounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Unable to construct group tree</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>Root</source>
+        <translation>Arrel</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>No es pot calcular la clau mestra</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Clau incorrecta o fitxer de base de dades corrupte.</translation>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
+        <source>Invalid group field type number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Invalid group field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Read group field data doesn&apos;t match size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Find</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;username</source>
+        <source>Incorrect group creation time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>Incorrect group access time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
+        <source>Incorrect group expiry time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open URL</source>
+        <source>Incorrect group icon field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Lock databases</source>
+        <source>Incorrect group level field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Title</source>
+        <source>Invalid group field type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;URL</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Notes</source>
+        <source>Missing entry field type number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Invalid entry field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
+        <source>Read entry field data doesn&apos;t match size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
+        <source>Invalid entry uuid field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
+        <source>Invalid entry group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
+        <source>Invalid entry icon field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>Invalid entry creation time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Invalid entry modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
+        <source>Invalid entry expiry time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>El fitxer de bloqueig d&apos;instància única no és vàlid. Execute una instància nova.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>No s&apos;ha pogut crear l&apos;arxiu de bloqueig. Inhabilitat el mode de instància única.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Ja s&apos;està executant una altra instància de KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Error mentre es provava les funcions criptogràfiques.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Base de dades</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation>Bases de dades &amp;recents</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Importa</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
+        <translation>&amp;Ajuda</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation>E&amp;ntrades</translation>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute to clipboard</source>
+        <translation>Copia l&apos;at&amp;ribut a porta-retalls</translation>
+    </message>
+    <message>
+        <source>Time-based one-time password</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>&amp;Groups</source>
+        <translation>&amp;Grups</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>&amp;Eines</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>Tanca</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;Sobre</translation>
+    </message>
+    <message>
         <source>&amp;Open database...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Obre una base de dades...</translation>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation>&amp;Desa la base de dades</translation>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation>Tanca base de dades</translation>
+    </message>
+    <message>
+        <source>&amp;New database</source>
+        <translation>&amp;Nova base de dades</translation>
+    </message>
+    <message>
+        <source>Merge from KeePassX database</source>
+        <translation>Combina base de dades KeePassX</translation>
+    </message>
+    <message>
+        <source>&amp;Add new entry</source>
+        <translation>&amp;Afegir entrada nova</translation>
+    </message>
+    <message>
+        <source>&amp;View/Edit entry</source>
+        <translation>&amp;Mostra/Edita l&apos;entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation>&amp;Esborra l&apos;entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Add new group</source>
+        <translation>&amp;Afegeix un nou grup</translation>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation>&amp;Edita el grup</translation>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>&amp;Suprimeix el grup</translation>
     </message>
     <message>
         <source>Sa&amp;ve database as...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Desa la base de dades com a...</translation>
     </message>
     <message>
         <source>Change &amp;master key...</source>
+        <translation>Canvia la clau &amp;mestra...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Configuració de la base de dades</translation>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation>Configuració de la base de dades</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clona l&apos;entrada</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>&amp;Cercar</translation>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation>Còpia el nom d&apos;&amp;usuari</translation>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation>Còpia el nom d&apos;usuari al porta-retalls</translation>
+    </message>
+    <message>
+        <source>Cop&amp;y password</source>
+        <translation>Còpia la contrasen&amp;ya</translation>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation>Còpia la contrasenya  al porta-retalls</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Conficuració</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>Generador de contrasenyes</translation>
+    </message>
+    <message>
+        <source>&amp;Perform Auto-Type</source>
+        <translation>Realitza complació automètica</translation>
+    </message>
+    <message>
+        <source>&amp;Open URL</source>
+        <translation>&amp;Obre URL</translation>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation>&amp;bloqueja la bases de dades</translation>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation>&amp;Títol</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>&amp;URL</source>
+        <translation>&amp;URL</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>&amp;Notes</source>
+        <translation>&amp;Notes</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exporta a fitxer CSV.</translation>
+    </message>
+    <message>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importa base de dades KeePass 1...</translation>
+    </message>
+    <message>
         <source>Import CSV file...</source>
-        <translation type="unfinished"/>
+        <translation>Importa fitxer CSV...</translation>
     </message>
     <message>
         <source>Re&amp;pair database...</source>
-        <translation type="unfinished"/>
+        <translation>Re&amp;para la base de dades...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Mostra TOTP</translation>
     </message>
     <message>
         <source>Set up TOTP...</source>
+        <translation>Configura TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Còpia &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Esborra l&apos;historial</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Error d&apos;accés al fitxer de configuració %1</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>read-only</source>
+        <translation>Només de lectura</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configuració</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Activar finestra</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Tanca KeePassXC</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dades de KeePass 2</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Tots els fitxers</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Obre la base de dades</translation>
+    </message>
+    <message>
+        <source>Save repaired database</source>
+        <translation>Desa base de dades reparada</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>Ha fallat l&apos;escriptura en la base de dades.</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Per favor, toqueu el botó en el seu YubiKey!</translation>
+    </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avançat</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
+        <source>Unknown cipher: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Unknown KDF: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unknown key type: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enable KeePassHTTP server</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return only best matching entries</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diàleg</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <translation>Requerit per a accedir a les seves bases de dades des de ChromeIPass o PassIFox</translation>
+    </message>
+    <message>
+        <source>Enable KeePassHTTP server</source>
+        <translation>Habilita el servidor KeePassHTTP</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>M&amp;ostra una notificació quan es demanen credencials</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Només retorna les millors coincidències per a una adreça URL específica en lloc de totes les entrades per al domini.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best matching entries</source>
+        <translation>Retorna només les millors coincidències de les entrades</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Sol·licitar el desbloqueig de la base de dades si està blocada</translation>
+    </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation type="unfinished"/>
+        <translation>Només s&apos;han retornat les entrades amb el mateix patró (http://, https://, ftp: / /,...).</translation>
     </message>
     <message>
         <source>&amp;Match URL schemes</source>
-        <translation type="unfinished"/>
+        <translation>Torna les coincidències amb patrons URL</translation>
+    </message>
+    <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Ordena les entrades coincidents per nom d&apos;&amp;usuari</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Ordena les entrades coincidents per títol</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Suprimeix totes les claus d&apos;encriptació compartides de la base de dades activa</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Esbo&amp;rra tots els permisos emmagatzemats de les entrades a la base de dades activa</translation>
     </message>
     <message>
         <source>Password Generator</source>
-        <translation type="unfinished"/>
+        <translation>Generador de contrasenyes</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançat</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Permet l&apos;&amp;accés a les entrades sempre</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Permet l&apos;act&amp;ualització de les entrades, sempre</translation>
     </message>
     <message>
         <source>Only the selected database has to be connected with a client.</source>
+        <translation>Només s&apos;ha de connectar amb un client, la base de dades seleccionada.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>&amp;Cerca en totes les bases de dades obertes, entrades coincidents</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>L&apos;actualització o creació de camps de test no està suportada.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Retorna camps avançats de text que comencen amb &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP Port:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Port per defecte: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC escolta a aquest port en 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>No podeu utilitzar ports privilegiats</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>No es poden utilitzar ports privilegiats inferiors a 1024!
+Utilitza per defecte port 19455.</translation>
+    </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p %</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Contrasenya:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>força</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Tipus de caràcter</translation>
     </message>
@@ -1741,126 +2940,378 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation type="unfinished"/>
+        <translation>Caràcters especials</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII estès</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
-        <translation type="unfinished"/>
+        <translation>Excloure caràcters d&apos;aspecte semblant</translation>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation>Tria caràcters de tots els grups</translation>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation>&amp;Longitud:</translation>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation>Llista de paraules:</translation>
+    </message>
+    <message>
+        <source>Word Count:</source>
+        <translation>Nombre de paraules:</translation>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation>Separador de paraula:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Genera</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Còpia</translation>
     </message>
     <message>
         <source>Accept</source>
+        <translation>Accepta</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Tanca</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>Aplica</translation>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation>Entropia: %1 bit(s)</translation>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation>Qualitat de la contrasenya: %1</translation>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation>Pobre</translation>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation>Feble</translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation>Bona</translation>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation>Excel·lent</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>%p%</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>strength</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>entropy</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Length:</source>
+        <source>Timeout or cannot connect to KeePassXC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Pick characters from every group</source>
+        <source>Action cancelled or denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Generate</source>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Close</source>
+        <source>KeePassXC association failed, try again</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Apply</source>
+        <source>Key change was not successful</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Entropy: %1 bit</source>
+        <source>Encryption key is not recognized</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Quality: %1</source>
+        <source>No saved databases found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Poor</source>
+        <source>Incorrect action</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Weak</source>
+        <source>Empty message received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Good</source>
+        <source>No URL provided</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Excellent</source>
+        <source>No logins found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password</source>
-        <translation>Contrasenya</translation>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Add a new entry to a database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Path of the database.</source>
+        <translation>Camí de la base de dades.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
+        <source>path</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
+        <source>Username for the entry.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
+        <source>username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
+        <source>URL for the entry.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
-        <source>NULL device</source>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>error reading from device</source>
+        <source>Generate a password for the entry.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>file empty !
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Extrau imprimeix el contingut d&apos;una base de dades.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Camí de la base de dades a extreure.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
 </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>malformed string</source>
+        <source>Name of the command to execute.</source>
+        <translation>Nom de l&apos;ordre a executar.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Llista les entrades de la base de dades.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Camí del grup a llistar. Per defecte és /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Fusiona dues bases de dades</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Camí de la base de dades origen a fusionar.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Camí de la base de dades de destí a fusionar.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nom de l&apos;entrada a mostrar.</translation>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation>Dispositiu nul</translation>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation>error de lectura del dispositiu</translation>
+    </message>
+    <message>
+        <source>file empty !
+</source>
+        <translation>fitxer buit!
+</translation>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation>cadena mal formada</translation>
+    </message>
+    <message>
         <source>missing closing quote</source>
+        <translation>falta la cometa de tancament</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1880,27 +3331,39 @@ Change them only if you know what you are doing.</source>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
-        <source>Browser Integration</source>
+        <source>Last Modified</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <source>Created</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Press</source>
+        <source>Legacy Browser Integration</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Browser Integration</source>
+        <translation>Integració amb el navegador</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation>Resposta de YubiKey [%1] - Slot %2 - %3</translation>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Prem</translation>
+    </message>
+    <message>
         <source>Passive</source>
+        <translation>Passiu</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1908,41 +3371,41 @@ Change them only if you know what you are doing.</source>
     <name>QtIOCompressor</name>
     <message>
         <source>Internal zlib error when compressing: </source>
-        <translation type="unfinished"/>
+        <translation>Error intern de zlib mentre s&apos;estava comprimint.</translation>
     </message>
     <message>
         <source>Error writing to underlying device: </source>
-        <translation type="unfinished"/>
+        <translation>Error d&apos;escriptura al dispositiu subjacent: </translation>
     </message>
     <message>
         <source>Error opening underlying device: </source>
-        <translation type="unfinished"/>
+        <translation>Error a l&apos;obrir el dispositiu subjacent: </translation>
     </message>
     <message>
         <source>Error reading data from underlying device: </source>
-        <translation type="unfinished"/>
+        <translation>Error de lectura al dispositiu subjacent: </translation>
     </message>
     <message>
         <source>Internal zlib error when decompressing: </source>
-        <translation type="unfinished"/>
+        <translation>Error intern de zlib al descomprimir: </translation>
     </message>
 </context>
 <context>
     <name>QtIOCompressor::open</name>
     <message>
         <source>The gzip format not supported in this version of zlib.</source>
-        <translation type="unfinished"/>
+        <translation>gzip no és un format compatible amb aquesta versió de zlib.</translation>
     </message>
     <message>
         <source>Internal zlib error: </source>
-        <translation type="unfinished"/>
+        <translation>Error intern de zlib:</translation>
     </message>
 </context>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"/>
+        <source>Search...</source>
+        <translation>Cerca...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1950,445 +3413,432 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Clear</source>
-        <translation type="unfinished"/>
+        <translation>Neteja</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation type="unfinished"/>
+        <source>Case Sensitive</source>
+        <translation>Distingeix entre majúscules i minúscules</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
-        <translation type="unfinished"/>
+        <translation>Limitar la cerca al grup seleccionat</translation>
     </message>
 </context>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nova petició de associació de clau</translation>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation type="unfinished"/>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
+        <translation>S&apos;ha rebut una sol·licitud d&apos;associació per a la citada clau.
+Voleu permetre l&apos;accés a la base de dades KeePassXC?
+ Doneu-li un nom únic per a poder identificar-la i seleccione acceptar.</translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Voleu sobreescriure la clau existent?</translation>
     </message>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation type="unfinished"/>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Ja existeix una clau de xifrat compartida amb el nom &quot;%1&quot;.
+Voleu sobreescriure-la?</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Actualitza l&apos;entrada</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Voleu actualitzar la informació en %1 - %2?</translation>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Base de dades bloquejada!</translation>
     </message>
     <message>
-        <source>Abort</source>
-        <translation type="unfinished"/>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>La base de dades activa està bloquejada!
+Per favor, desbloqueu  la base de dades seleccionada o escolliu-ne una altra.</translation>
     </message>
     <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Claus de la base de dades eliminades</translation>
     </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No s&apos;han trobat claus</translation>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation type="unfinished"/>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>No s&apos;han trobat claus d&apos;encriptació compartides en la configuració de KeePassHttp.</translation>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: La configuració no està disponible!</translation>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation type="unfinished"/>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>La base de dades activa no conté cap entrada de configuració de KeePassHttp.</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation type="unfinished"/>
+        <source>Removing stored permissions...</source>
+        <translation>Eliminant permisos emmagatzemats...</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation type="unfinished"/>
+        <source>Abort</source>
+        <translation>Avorta</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permisos eliminats</translation>
     </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No s&apos;ha trobat cap entrada amb permisos!</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation type="unfinished"/>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de dades activa no conté cap entrada amb permisos.</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidget</name>
     <message>
         <source>Application Settings</source>
-        <translation type="unfinished"/>
+        <translation>Configuració de l&apos;aplicació</translation>
     </message>
     <message>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>General</translation>
     </message>
     <message>
         <source>Security</source>
-        <translation type="unfinished"/>
+        <translation>Seguretat</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation type="unfinished"/>
+        <translation>Error d&apos;accés al fitxer de configuració %1</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Configuració bàsica</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Obriu només una sola instància del KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
-        <translation type="unfinished"/>
+        <translation>Recordeu les últimes bases de dades</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Recordeu els últims arxius clau i motxilles de seguretat</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Carregueu les bases de dades anteriors a l&apos;obrir el KeepassXC</translation>
     </message>
     <message>
         <source>Automatically save on exit</source>
-        <translation type="unfinished"/>
+        <translation>Deseu en tancar de forma automàtica</translation>
     </message>
     <message>
         <source>Automatically save after every change</source>
-        <translation type="unfinished"/>
+        <translation>Deseu després de cada canvi de forma automàtica</translation>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation type="unfinished"/>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Torneu a carregar automàticament la base de dades quan siga modificada de forma externa</translation>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation type="unfinished"/>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimitzeu en copiar al porta-retalls</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation type="unfinished"/>
+        <source>Minimize window at application startup</source>
+        <translation>Minimitzeu la finestra a l&apos;obrir l&apos;aplicació</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation type="unfinished"/>
+        <source>Use group icon on entry creation</source>
+        <translation>Utilitzeu la icona del grup al crear una entrada</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation type="unfinished"/>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>No marqueu la base de dades com a modificada si no han hagut canvis en les dades (per exemple, a l&apos;expandir grups)</translation>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Hide the Details view</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation type="unfinished"/>
+        <source>Show a system tray icon</source>
+        <translation>Mostreu una icona a la safata del sistema</translation>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation type="unfinished"/>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Amagueu la finestra a la safata del sistema quan es minimitze</translation>
     </message>
     <message>
         <source>Hide window to system tray instead of app exit</source>
-        <translation type="unfinished"/>
+        <translation>Amagueu la finestra a la safata del sistema en lloc de tancar KeepassXC</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Dark system tray icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Basic Settings</source>
-        <translation type="unfinished"/>
+        <source>Language</source>
+        <translation>Idioma</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation type="unfinished"/>
+        <source>Auto-Type</source>
+        <translation>Compleció automàtica</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation type="unfinished"/>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Pregunteu sempre abans d&apos;efectuar la compleció automàtica</translation>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
-        <translation type="unfinished"/>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Drecera global de compleció automàtica</translation>
     </message>
     <message>
         <source>Auto-Type delay</source>
-        <translation type="unfinished"/>
+        <translation>Retard de la compleció automàtica</translation>
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Temps excedits</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
-        <translation type="unfinished"/>
+        <translation>Neteja el porta-retalls després</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"/>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation type="unfinished"/>
+        <translation>Bloquegeu les bases de dades després d&apos;estar inactives per</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation type="unfinished"/>
+        <source>Convenience</source>
+        <translation>Conveniència</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Bloquegeu les bases de dades quan sessió siga bloquejada o es tanque la tapa</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation type="unfinished"/>
+        <translation>Bloquegeu les bases de dades després minimitzar la finestra</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
-        <translation type="unfinished"/>
+        <translation>No requerir la repetició de la contrasenya quan aquesta és visible</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Mostreu per defecte les contrasenyes en text sense xifrar</translation>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Hide passwords in the preview panel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Hide entry notes by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
-        <translation type="unfinished"/>
+        <translation>Privacitat</translation>
     </message>
     <message>
         <source>Use Google as fallback for downloading website icons</source>
-        <translation type="unfinished"/>
+        <translation>Utilitzeu Google com a alternativa per a descarregar icones de llocs web</translation>
     </message>
 </context>
 <context>
     <name>SetupTotpDialog</name>
     <message>
         <source>Setup TOTP</source>
-        <translation type="unfinished"/>
+        <translation>Organització TOTP</translation>
     </message>
     <message>
         <source>Key:</source>
+        <translation>Clau:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use custom settings</source>
+        <source>Steam token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Use custom settings</source>
+        <translation>Utilitza la configuració personalitzada</translation>
+    </message>
+    <message>
         <source>Note: Change these settings only if you know what you are doing.</source>
-        <translation type="unfinished"/>
+        <translation>Nota: Canvieu aquesta configuració només si sabeu què esteu fent.</translation>
     </message>
     <message>
         <source>Time step:</source>
-        <translation type="unfinished"/>
+        <translation>Intervals:</translation>
     </message>
     <message>
         <source>8 digits</source>
-        <translation type="unfinished"/>
+        <translation>8 dígits</translation>
     </message>
     <message>
         <source>6 digits</source>
-        <translation type="unfinished"/>
+        <translation>6 dígits</translation>
     </message>
     <message>
         <source>Code size:</source>
-        <translation type="unfinished"/>
+        <translation>Mida del codi:</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"/>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
     </message>
 </context>
 <context>
     <name>TotpDialog</name>
     <message>
         <source>Timed Password</source>
-        <translation type="unfinished"/>
+        <translation>Contrasenya per temps</translation>
     </message>
     <message>
         <source>000000</source>
-        <translation type="unfinished"/>
+        <translation>000000</translation>
     </message>
     <message>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Còpia</translation>
     </message>
     <message>
         <source>Expires in</source>
-        <translation type="unfinished"/>
+        <translation>Caduca el</translation>
     </message>
     <message>
         <source>seconds</source>
-        <translation type="unfinished"/>
+        <translation>segons</translation>
     </message>
 </context>
 <context>
     <name>UnlockDatabaseWidget</name>
     <message>
         <source>Unlock database</source>
-        <translation type="unfinished"/>
+        <translation>Desbloqueja la base de dades</translation>
     </message>
 </context>
 <context>
     <name>WelcomeWidget</name>
     <message>
         <source>Welcome to KeePassXC</source>
-        <translation type="unfinished"/>
+        <translation>Benvingut a KeePassXC</translation>
     </message>
     <message>
         <source>Start storing your passwords securely in a KeePassXC database</source>
-        <translation type="unfinished"/>
+        <translation>Comenceu a emmagatzemar les vostres contrasenyes de manera segura en una base de dades KeePassXC</translation>
     </message>
     <message>
         <source>Create new database</source>
-        <translation type="unfinished"/>
+        <translation>Crea una nova base de dades</translation>
     </message>
     <message>
         <source>Open existing database</source>
-        <translation type="unfinished"/>
+        <translation>Obre una base de dades existent</translation>
     </message>
     <message>
         <source>Import from KeePass 1</source>
-        <translation type="unfinished"/>
+        <translation>Importa de KeePass 1</translation>
     </message>
     <message>
         <source>Import from CSV</source>
-        <translation type="unfinished"/>
+        <translation>Importa d&apos;un fitxer CSV</translation>
     </message>
     <message>
         <source>Recent databases</source>
-        <translation type="unfinished"/>
+        <translation>Bases de dades obertes recentment</translation>
     </message>
 </context>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation type="unfinished"/>
+        <translation>Camí de la base de dades.</translation>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gestor de contrasenyes multi-plataforma</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation type="unfinished"/>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Noms de les bases de dades de contrasenya per a obrir (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation type="unfinished"/>
+        <source>path to a custom config file</source>
+        <translation>camí cap a un fitxer personalitzat de configuració</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation type="unfinished"/>
+        <source>key file of the database</source>
+        <translation>Arxiu clau de la base de dades</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation type="unfinished"/>
+        <source>read password of the database from stdin</source>
+        <translation>llegiu la contrasenya de la base de dades des de l&apos;entrada estàndard (stdin)</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_cs.ts b/share/translations/keepassx_cs.ts
index 737c2b03e..50fb01983 100644
--- a/share/translations/keepassx_cs.ts
+++ b/share/translations/keepassx_cs.ts
@@ -10,14 +10,34 @@
         <translation>O aplikaci</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Chyby hlaste na: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC je šířeno pod GNU obecnou veřejnou licencí (GPL) verze 2 a (případně) 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Správci projektu:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Na vývoji se podíleli</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Viz přispěvatelé na portálu GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Ladící informace</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>K hlášení chyby vždy připojte následující údaje:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Zkopírovat do schránky</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revize: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribuce: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Knihovny:</translation>
     </message>
@@ -47,34 +71,14 @@ Jádro systému: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Zapnutá rozšíření:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Chyby hlaste na: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC je šířeno pod GNU obecnou veřejnou licencí (GPL) verze 2 a (případně) 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Správci projektu:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Viz přispěvatelé na portálu GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>K hlášení chyby vždy připojte následující údaje:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribuce: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Potvrzení přístupu KeePassXC HTTP</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Zapamatovat si toto rozhodnutí</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 si vyžádalo přístup k heslům u následujících položek.
 Umožnit přístup?</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Potvrzení přístupu KeePassXC HTTP</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Povolit SSH agenta (vyžaduje restart)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Umožnit přístup?</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Automatické vyplňování – KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatické vyplňování</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Umožnit přístup?</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Automatické vyplňování – KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Vyberte záznam, kterým se bude automaticky vyplňovat:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Automatické vyplňování – KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Zapamatovat si toto rozhodnutí</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Umožnit</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Odepřít</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 si vyžádalo přístup k heslům u následujících položek.
+Umožnit přístup?</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Vyžádat odemknutí zamčené databáze</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Vrátí pouze nejlepší shody pro konkrétní URL adresu namísto všech položek pro celou doménu.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Pouze označené databáze budou spojeny s klientem.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatická vytváření nebo aktualizace nejsou u textových kolonek podporované!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Odpovědět také kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH:“</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Procházet…</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: nový požadavek na přiřazení klíče</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Uložit a povolit přístup</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Přepsat stávající klíč?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Aktualizovat záznam</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Chcete aktualizovat údaj v %1 – %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Databáze uzamčena!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Právě otevřená databáze je uzamčená!
+Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Nastavení nejsou k dispozici!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Klíče nebyly nalezeny</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Klíče odebrány z databáze</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Přerušit</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Odebraná oprávnění</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nebyl nalezen záznam s oprávněními!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Umožnit přístup?</translation>
         <translation>Zopakujte heslo:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Soubor s &amp;klíčem</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Procházet</translation>
     </message>
@@ -157,6 +465,14 @@ Umožnit přístup?</translation>
         <translation>Vytvořit</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Výzva–odpověď</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Načíst znovu</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Soubory s klíči</translation>
     </message>
@@ -177,6 +493,10 @@ Umožnit přístup?</translation>
         <translation>Vyberte soubor s klíčem</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Prázdné heslo</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Opravdu ponechat bez hesla, tedy nechráněné?</translation>
     </message>
@@ -191,20 +511,15 @@ Umožnit přístup?</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Soubor s &amp;klíčem</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Výzva–odpověď</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Načíst znovu</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Prázdné heslo</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Umožnit přístup?</translation>
         <translation>Předvolby klonu</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Připojit k titulku „ – klon“</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Nahradit uživatelské jméno a heslo těmi referenčními</translation>
     </message>
@@ -225,10 +544,6 @@ Umožnit přístup?</translation>
         <source>Copy history</source>
         <translation>Kopírovat historii</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Připojit k titulku „ – klon“</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Umožnit přístup?</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importovat CSV soubor</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Chyba</translation>
     </message>
@@ -340,17 +651,17 @@ Umožnit přístup?</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>bajt,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>řádků,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>sloupců</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,12 +683,35 @@ Umožnit přístup?</translation>
         <translation>Procházet</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Načíst znovu</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Výzva–odpověď:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Databázi se nedaří otevřít.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Soubor s klíčem se nedaří otevřít</translation>
+        <translation>Nedaří se otevřít soubor s klíčem</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Toto varování znovu nezobrazovat</translation>
     </message>
     <message>
         <source>All files</source>
@@ -391,14 +725,6 @@ Umožnit přístup?</translation>
         <source>Select key file</source>
         <translation>Vyberte soubor s klíčem</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Načíst znovu</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Výzva–odpověď:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,12 +741,12 @@ Umožnit přístup?</translation>
         <translation>Nedaří se otevřít soubor s klíčem</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Databázi se podařilo v pořádku otevřít. Není třeba žádného zásahu.</translation>
+        <source>Unable to open the database.</source>
+        <translation>Databázi se nedaří otevřít.</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Nedaří se otevřít databázi.</translation>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Databázi se podařilo v pořádku otevřít. Není třeba žádného zásahu.</translation>
     </message>
     <message>
         <source>Success</source>
@@ -440,40 +766,57 @@ Nyní je možné ji uložit.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Název databáze:</translation>
+        <source>General</source>
+        <translation>Obecné</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Popis databáze:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Počet průchodů šifrovacího algoritmu:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Výchozí uživatelské jméno:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Výkonnostní test</translation>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Omezit počet uchovávaných předchozích verzí záznamů na:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Omezit datový objem uchovávaných předchozích verzí záznamů na:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Namísto mazání přesouvat do Koše</translation>
+        <source>KDF unchanged</source>
+        <translation>KDF nezměněno</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,19 +827,83 @@ Nyní je možné ji uložit.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmus:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Počet průchodů šifrovacího algoritmu:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Název databáze:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Popis databáze:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Výchozí uživatelské jméno:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Omezit počet uchovávaných předchozích verzí záznamů na:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Omezit datový objem uchovávaných předchozích verzí záznamů na:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Namísto mazání přesouvat do Koše</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Kořen</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>Databáze ve formátu KeePass verze 2</translation>
+        <translation>Databáze ve formátu KeePass 2</translation>
     </message>
     <message>
         <source>All files</source>
@@ -511,22 +918,48 @@ Nyní je možné ji uložit.</translation>
         <translation>Soubor nebyl nalezen!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Otevřít databázi ve formátu KeePass verze 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Databázi se nedaří otevřít.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Databáze ve formátu KeePass verze 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Soubor otevřen v režimu pouze pro čtení.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Otevřít CSV soubor</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV soubor</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Veškeré soubory (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Sloučit databáze</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Otevřít databázi ve formátu KeePass verze 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Databáze ve formátu KeePass verze 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Zavřít?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>„%1“ je právě upravováno.
+Přesto zavřít a zahodit tak změny?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Uložit změny?</translation>
     </message>
@@ -541,10 +974,22 @@ Uložit změny?</translation>
         <translation>Zápis do databáze se nezdařil.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Hesla</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Uložit databázi jako</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Exportovat databázi do CSV souboru</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Zápis do CSV souboru se nezdařil.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nová databáze</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Pokud chcete změny dokončit, klikněte na Storno. V opačném případě změny zahodíte.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Tato databáze doposud ještě nebyla uložena.
-Buď ji můžete uložit, nebo neuzamknout.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,70 +1015,14 @@ Otherwise your changes are lost.</source>
 Chcete ji před uzamčením uložit?
 Pokud ne, provedené změny budou ztraceny.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>„%1“ je právě upravováno.
-Přesto zavřít a zahodit tak změny?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Exportovat databázi do CSV souboru</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV soubor</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Zápis do CSV souboru se nezdařil.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Databázi se nedaří otevřít.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Sloučit databáze</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Databáze, kterou se pokoušíte uložit, je právě používaná jinou instancí KeePassXC.
-Chcete ji přesto uložit?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Hesla</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Tato databáze je již otevřená</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Databáze kterou se pokoušíte otevřít je právě používaná jinou instancí KeePassXC.
-
-Chcete ji přesto otevřít?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Otevřít pouze pro čtení</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Soubor otevřen v režimu pouze pro čtení.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Otevřít CSV soubor</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Hledání…</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Změnit hlavní klíč</translation>
     </message>
@@ -660,36 +1043,44 @@ Chcete ji přesto otevřít?</translation>
         <translation>Opravdu chcete nenávratně smazat %1 záznamů?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Přesunout záznam do Koše?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Opravdu přesunout záznam &quot;%1&quot; do Koše?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Přesunout záznamy do Koše?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Opravdu přesunout %n záznam do Koše? ()</numerusform><numerusform>Opravdu přesunout %n záznamy do Koše? ()</numerusform><numerusform>Opravdu přesunout %n záznamů do Koše?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Smazat skupinu?</translation>
+        <source>Execute command?</source>
+        <translation>Spustit příkaz?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Opravdu chcete nenávratně smazat skupinu „%1“?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Opravdu spustit následující příkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nedaří se spočítat hlavní klíč</translation>
+        <source>Remember my choice</source>
+        <translation>Zapamatovat si pro příště</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Přesunout záznam do Koše?</translation>
+        <source>Delete group?</source>
+        <translation>Smazat skupinu?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Opravdu přesunout záznam &quot;%1&quot; do Koše?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Opravdu chcete nenávratně smazat skupinu „%1“?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Hledání…</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -708,20 +1099,8 @@ Chcete ji přesto otevřít?</translation>
         <translation>Nic nenalezeno</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Spustit příkaz?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Opravdu spustit následující příkaz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Zapamatovat si pro příště</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Požadavek na automatické opětovné načtení</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -732,8 +1111,9 @@ Chcete ji přesto otevřít?</translation>
         <translation>Požadavek na sloučení</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Soubor s databází byl změněn a vaše změny do něj nejsou uloženy. Přejete si své změny začlenit?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -749,6 +1129,89 @@ Chcete ji přesto otevřít?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zavřít</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL adresa</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Uživatelské jméno</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Přílohy</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Pořadí</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Hledat</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Vyčistit</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nikdy</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -775,6 +1238,30 @@ Chcete ji přesto otevřít?</translation>
         <translation>Historie</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Historie záznamu</translation>
     </message>
@@ -795,22 +1282,20 @@ Chcete ji přesto otevřít?</translation>
         <translation>Nový atribut</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Vyberte soubor</translation>
+        <source>Confirm Remove</source>
+        <translation>Potvrdit odebrání</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Soubor se nedaří otevřít</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Opravdu chcete odebrat tento atribut?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Uložit přílohu</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Přílohu se nedaří uložit:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -818,32 +1303,16 @@ Chcete ji přesto otevřít?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n týden</numerusform><numerusform>%n týdny</numerusform><numerusform>%n týdnů</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 rok</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Potvrdit odebrání</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Opravdu chcete odebrat tento atribut?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[CHRÁNĚNO] Pro zobrazení nebo úpravu klikněte na Odhalit</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Opravdu chcete tuto přílohu odebrat?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -860,18 +1329,6 @@ Chcete ji přesto otevřít?</translation>
         <translation>Odebrat</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Přílohy</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Uložit</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Otevřít</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Upravit název</translation>
     </message>
@@ -883,6 +1340,10 @@ Chcete ji přesto otevřít?</translation>
         <source>Reveal</source>
         <translation>Odhalit</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Přílohy</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -891,6 +1352,18 @@ Chcete ji přesto otevřít?</translation>
         <translation>Zapnout automatické vyplňování tohoto záznamu</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Převzít výchozí pořadí automatického vyplňování od skupiny</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Po&amp;užít vlastní pořadí automatického vyplňování:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Přiřazení oken</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -903,14 +1376,6 @@ Chcete ji přesto otevřít?</translation>
         <translation>Titulek okna:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Převzít výchozí pořadí automatického vyplňování od skupiny</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Po&amp;užít vlastní pořadí automatického vyplňování:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Použít výchozí pořadí</translation>
     </message>
@@ -918,10 +1383,6 @@ Chcete ji přesto otevřít?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Nastavit vlastní pořadí:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Přiřazení oken</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -945,12 +1406,8 @@ Chcete ji přesto otevřít?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Titulek:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uživatelské jméno:</translation>
+        <source>URL:</source>
+        <translation>URL adresa:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -961,20 +1418,104 @@ Chcete ji přesto otevřít?</translation>
         <translation>Zopakování hesla:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL adresa:</translation>
+        <source>Title:</source>
+        <translation>Titulek:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Platnost skončí</translation>
+        <source>Notes</source>
+        <translation>Poznámky</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Předpřipravené</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Poznámky:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Uživatelské jméno:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Platnost skončí</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Zkopírovat do schránky</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Procházet…</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Příloha</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1046,6 +1587,14 @@ Chcete ji přesto otevřít?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>Po&amp;užít výchozí ikonu</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Použít svou vlastní ikonu</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Přidat svou vlastní ikonu</translation>
     </message>
@@ -1054,6 +1603,18 @@ Chcete ji přesto otevřít?</translation>
         <translation>Smazat svou vlastní ikonu</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Stáhnout ikonu webu (favicon)</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Ikonu webu (favicon) se nedaří stáhnout.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Rada: Jako náhradní řešení můžete zapnout Google v Nástroje → Nastavení → Zabezpečení</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Obrázky</translation>
     </message>
@@ -1066,24 +1627,12 @@ Chcete ji přesto otevřít?</translation>
         <translation>Vyberte obrázek</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Stáhnout ikonu webu (favicon)</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Ikonu webu (favicon) se nedaří stáhnout.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Ikonu se nedaří načíst</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>Po&amp;užít výchozí ikonu</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Použít svou vlastní ikonu</translation>
+        <source>Custom icon already exists</source>
+        <translation>Tato vlastní ikona už existuje</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1093,14 +1642,6 @@ Chcete ji přesto otevřít?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Tato ikona je používána %1 záznamy a bude nahrazena výchozí ikonou. Opravdu ji chcete smazat?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Rada: Jako náhradní řešení můžete zapnout Google v Nástroje → Nastavení → Zabezpečení</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Tato vlastní ikona už existuje</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1125,10 +1666,94 @@ Chcete ji přesto otevřít?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Klon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Název</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Velikost</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Přidat</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Odebrat</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Otevřít</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Uložit</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Potvrdit odebrání</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1157,6 +1782,11 @@ Chcete ji přesto otevřít?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Skupina</translation>
     </message>
@@ -1172,11 +1802,6 @@ Chcete ji přesto otevřít?</translation>
         <source>URL</source>
         <translation>URL adresa</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1186,6 +1811,17 @@ Chcete ji přesto otevřít?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1248,6 +1884,361 @@ Chcete ji přesto otevřít?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nedaří se vyvolat výzva-odpověď.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Byl zadán chybný klíč, nebo je poškozen databázový soubor.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nedaří se vyvolat výzva-odpověď.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nedaří se spočítat hlavní klíč</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Nejedná se o databázi KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Zvolený soubor je databáze ve starém formátu KeePass 1 (.kdb).
+
+Můžete ho importovat pomocí Databáze → Importovat databázi ve formátu KeePass 1….
+Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otevřít ve staré verzi KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1266,7 +2257,7 @@ Chcete ji přesto otevřít?</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>Nejedná se o databázi Keepass.</translation>
+        <translation>Nejedná se o databázi KeePass.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -1277,6 +2268,35 @@ Chcete ji přesto otevřít?</translation>
         <translation>Nepodporovaná verze databáze KeePass.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Kořen</translation>
     </message>
@@ -1288,129 +2308,141 @@ Chcete ji přesto otevřít?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Byl zadán chybný klíč, nebo je poškozen databázový soubor.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Nejedná se o databázi KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Nepodporovaná verze databáze KeePass.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Byl zadán chybný klíč, nebo je poškozen databázový soubor.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nedaří se spočítat hlavní klíč</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nedaří se vyvolat výzva-odpověď.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Zvolený soubor je databáze ve starém formátu KeePass 1 (.kdb).
-
-Můžete ho importovat pomocí Databáze → Importovat databázi ve formátu KeePass 1….
-Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otevřít ve staré verzi KeePassX 0.4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nedaří se vyvolat výzva-odpověď.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nedaří se spočítat hlavní klíč</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Při zkoušení šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – chyba</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Soubor se zámkem se nepodařilo vytvořit. Režim jediné instance proto vypnut.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Již je spuštěná jiná instance KeePassXC.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Existující uzamykací soubor, zajišťující spuštění pouze jedné instance, není platný. Spouští se nová instance.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Otevřít databázi</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Nastavení databáze</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Zkopírovat uživatelské jméno do schránky</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Zkopírovat heslo do schránky</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Nastavení</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Zobrazovat lištu nástrojů</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>pouze pro čtení</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Zobrazit/skrýt okno</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Databáze ve formátu KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Veškeré soubory</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Uložit opravenou databázi</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existující uzamykací soubor, zajišťující spuštění pouze jedné instance, není platný. Spouští se nová instance.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Zápis do databáze se nezdařil.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Soubor se zámkem se nepodařilo vytvořit. Režim jediné instance proto vypnut.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Již je spuštěná jiná instance KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Při zkoušení šifrovacích funkcí byl zjištěn fatální nedostatek.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – chyba</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Databáze</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Nedávno otevřené databáze</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importovat</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Nápověda</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Záz&amp;namy</translation>
     </message>
@@ -1419,12 +2451,16 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Zkopí&amp;rovat atribut do schránky</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>Skupiny</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>Zobrazit</translation>
+        <source>&amp;Tools</source>
+        <translation>Nás&amp;troje</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1435,6 +2471,10 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>O &amp;aplikaci</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Otevřít databázi…</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Uložit databázi</translation>
     </message>
@@ -1475,24 +2515,24 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Smazat skupinu</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Nastavení &amp;databáze</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>&amp;Uložit databázi jako…</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>Klonovat záznam</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Z&amp;měnit hlavní klíč…</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Časované jednorázové heslo</translation>
+        <source>&amp;Database settings</source>
+        <translation>Nastavení &amp;databáze</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Zkopírovat &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Nastavení databáze</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Zobrazit TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Klonovat záznam</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1503,14 +2543,26 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>Zkopírovat &amp;uživatelské jméno</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Zkopírovat uživatelské jméno do schránky</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Zkopírovat heslo</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Zkopírovat heslo do schránky</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>Na&amp;stavení</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Generátor hesel</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Provést automatické vyplnění</translation>
     </message>
@@ -1527,165 +2579,210 @@ Jedná se o jednosměrný převod. Databázi, vzniklou z importu, nepůjde otev�
         <translation>&amp;Titulek</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL adresa</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>Poz&amp;námky</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Generátor hesel</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Vyčistit historii</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exportovat do CSV souboru…</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Databáze</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importovat databázi aplikace KeePass verze 1…</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importovat</translation>
+        <source>Import CSV file...</source>
+        <translation>Importovat CSV soubor…</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>Nás&amp;troje</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>O&amp;pravit databázi…</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Zobrazit TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Nastavit TOTP…</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Vyprázdnit Koš</translation>
+        <source>Copy &amp;TOTP</source>
+        <translation>Zkopírovat &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Vyčistit historii</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Chyba přístupu k souboru s nastaveními %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Ukončit KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Dotkněte se tlačítka na svém YubiKey zařízení!</translation>
+        <source>read-only</source>
+        <translation>pouze pro čtení</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Nápověda</translation>
+        <source>Settings</source>
+        <translation>Nastavení</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Otevřít databázi…</translation>
+        <source>Toggle window</source>
+        <translation>Zobrazit/skrýt okno</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>&amp;Uložit databázi jako…</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Ukončit KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Z&amp;měnit hlavní klíč…</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Databáze ve formátu KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exportovat do CSV souboru…</translation>
+        <source>All files</source>
+        <translation>Veškeré soubory</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importovat databázi aplikace KeePass verze 1…</translation>
+        <source>Open database</source>
+        <translation>Otevřít databázi</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importovat CSV soubor…</translation>
+        <source>Save repaired database</source>
+        <translation>Uložit opravenou databázi</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>O&amp;pravit databázi…</translation>
+        <source>Writing the database failed.</source>
+        <translation>Zápis do databáze se nezdařil.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Nastavit TOTP…</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Dotkněte se tlačítka na svém YubiKey zařízení!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Obecné</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Z&amp;obrazit oznámení když jsou požadovány přihlašovací údaje</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Seřadit odpovídající záznamy dle &amp;uživatelského jména</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Z právě otevřené databáze odebrat veškerá uložená oprávnění</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Pokročilé</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Vždy umožnit přístup k zázn&amp;amům</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Vždy umožnit akt&amp;ualizovat záznamy</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Vy&amp;hledat odpovídající záznamy ve všech otevřených databázích</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP port:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Výchozí port: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation>Neznámá šifra:</translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Vyžádat odemknutí zamčené databáze</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Seřadit odpovídající zázna&amp;my dle názvu</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC bude očekávat spojení na tomto portu na adrese 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Není možné navázat se na privilegované porty</translation>
+        <source>Unknown KDF: </source>
+        <translation>Neznámé KDF:</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Není možné navázat na porty s číslem nižším, než 1024!
-Náhradně bude použit port 19455.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Z právě otevřené databáze od&amp;ebrat veškeré sdílené šifrovací klíče</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Odpovědět také kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH:“</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatická vytváření nebo aktualizace nejsou u textových kolonek podporované!</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1696,6 +2793,15 @@ Náhradně bude použit port 19455.</translation>
         <translation>Zapnout KeePassHTTP server</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Obecné</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Z&amp;obrazit oznámení když jsou požadovány přihlašovací údaje</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Vrátí pouze nejlepší shody pro konkrétní URL adresu namísto všech položek pro celou doménu.</translation>
     </message>
@@ -1704,6 +2810,10 @@ Náhradně bude použit port 19455.</translation>
         <translation>V&amp;racet pouze nejlépe odpovídající položky</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Vyžádat odemknutí zamčené databáze</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Jsou vráceny pouze položky se stejným schématem (http://, https://, ftp://, …).</translation>
     </message>
@@ -1712,27 +2822,108 @@ Náhradně bude použit port 19455.</translation>
         <translation>&amp;Hledat shodu s URL schématy</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Seřadit odpovídající záznamy dle &amp;uživatelského jména</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Seřadit odpovídající zázna&amp;my dle názvu</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Z právě otevřené databáze od&amp;ebrat veškeré sdílené šifrovací klíče</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Z právě otevřené databáze odebrat veškerá uložená oprávnění</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Generátor hesel</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Pokročilé</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Vždy umožnit přístup k zázn&amp;amům</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Vždy umožnit akt&amp;ualizovat záznamy</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Pouze označené databáze budou spojeny s klientem.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Následující předvolby mohou být nebezpečné!
-Měňte je pouze, pokud víte, co děláte.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Vy&amp;hledat odpovídající záznamy ve všech otevřených databázích</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatická vytváření nebo aktualizace nejsou u textových kolonek podporované!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Odpovědět také kolonkami pok&amp;ročilých textových řetězců které začínají na „KPH:“</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP port:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Výchozí port: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC bude očekávat spojení na tomto portu na adrese 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Není možné navázat se na privilegované porty</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Není možné navázat na porty s číslem nižším, než 1024!
+Náhradně bude použit port 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Heslo:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>odolnost</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>nahodilost</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Typy znaků</translation>
     </message>
@@ -1753,38 +2944,50 @@ Měňte je pouze, pokud víte, co děláte.</translation>
         <translation>Zvláštní znaky</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Rozšířené ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Vynechat podobně vypadající znaky (předejití záměně)</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Přijmout</translation>
+        <source>Pick characters from every group</source>
+        <translation>Zajistit přítomnost znaků ze všech zvolených skupin</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>Dé&amp;lka:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>odolnost</translation>
+        <source>Passphrase</source>
+        <translation>Heslová fráze</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>nahodilost</translation>
+        <source>Wordlist:</source>
+        <translation>Slovník:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>Dé&amp;lka:</translation>
+        <source>Word Count:</source>
+        <translation>Počet slov:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Zajistit přítomnost znaků ze všech zvolených skupin</translation>
+        <source>Word Separator:</source>
+        <translation>Oddělovač slov:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Tvoř</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Přijmout</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Zavřít</translation>
     </message>
@@ -1802,51 +3005,270 @@ Měňte je pouze, pokud víte, co děláte.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Velmi slabé</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Slabé</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Dobré</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Výborné</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Heslo</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Rozšířené ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Heslová fráze</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Slovník:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Počet slov:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Oddělovač slov:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopírovat</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Umístění databáze.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>cesta</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>uživatelské jméno</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL adresa</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>délka</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Vytáhnout a vypsat obsah databáze.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Umístění extrahované databáze.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Název příkazu ke spuštění.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Vypsat položky databáze.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Umístění seznamu skupin. Výchozí je /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Sloučit dvě databáze.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Umístění sloučené databáze.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Umístění výchozí databáze.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>atribut</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Název položky k zobrazení.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL zařízení</translation>
@@ -1870,8 +3292,28 @@ Měňte je pouze, pokud víte, co děláte.</translation>
         <translation>chybějící uzavírací uvozovka</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>VNITŘNÍ – unget lower bound překročeno</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1890,14 +3332,22 @@ Měňte je pouze, pokud víte, co děláte.</translation>
         <translation>Heslo</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL adresa</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Poznámky</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Napojení na webový prohlížeč</translation>
     </message>
@@ -1913,6 +3363,10 @@ Měňte je pouze, pokud víte, co děláte.</translation>
         <source>Passive</source>
         <translation>Pasivní</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1951,8 +3405,8 @@ Měňte je pouze, pokud víte, co děláte.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Rozlišovat velikost písmen</translation>
+        <source>Search...</source>
+        <translation>Hledat…</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1963,8 +3417,8 @@ Měňte je pouze, pokud víte, co děláte.</translation>
         <translation>Vyčistit</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Hledat…</translation>
+        <source>Case Sensitive</source>
+        <translation>Rozlišovat velikost písmen</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1974,50 +3428,6 @@ Měňte je pouze, pokud víte, co děláte.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Již existuje sdílený šifrovací klíč s názvem „%1“.
-Chcete ho přepsat?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Chcete aktualizovat údaj v %1 – %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Právě otevřená databáze je uzamčená!
-Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Z nastavení KeePassX/Http bylo úspěšně odebráno %1 šifrování-%2.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>V nastavení KeePassHttp nebyly nalezeny žádné sdílené šifrovací klíče.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Právě otevřená databáze neobsahuje žádný záznam nastavení KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Odstraňování uložených oprávnění…</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Přerušit</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Oprávnění %1 %2 úspěšně odebrána.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: nový požadavek na přiřazení klíče</translation>
     </message>
@@ -2034,33 +3444,77 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
         <translation>KeePassXC: Přepsat stávající klíč?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Již existuje sdílený šifrovací klíč s názvem „%1“.
+Chcete ho přepsat?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Aktualizovat záznam</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Chcete aktualizovat údaj v %1 – %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Databáze uzamčena!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Právě otevřená databáze je uzamčená!
+Buď jí odemkněte, nebo vyberte jinou, odemčenou.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Klíče odebrány z databáze</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Klíče nebyly nalezeny</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>V nastavení KeePassHttp nebyly nalezeny žádné sdílené šifrovací klíče.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Nastavení nejsou k dispozici!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Právě otevřená databáze neobsahuje žádný záznam nastavení KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Odstraňování uložených oprávnění…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Přerušit</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Odebraná oprávnění</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Nebyl nalezen záznam s oprávněními!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Právě otevřená databáze neobsahuje záznam s oprávněními.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2078,16 +3532,32 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
-        <translation>Chyba přístupu pro soubor s nastaveními %1</translation>
+        <translation>Chyba přístupu k souboru s nastaveními %1</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Základní nastavení</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Spouštět pouze jedinou instanci KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Pamatovat si nedávno otevřené databáze</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Pamatovat si minule použité soubory s klíči a zabezpečovací klíčenky</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Při spouštění aplikace načíst minule otevřené databáze</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Před ukončením aplikace automaticky uložit případné změny</translation>
     </message>
@@ -2096,20 +3566,28 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
         <translation>Po každé změně hned automaticky uložit</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>V případě úpravy zvenčí, automaticky opětovně načíst databázi</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Po zkopírování údaje do schránky odklidit okno aplikace jeho automatickou minimalizací</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Spouštět aplikaci s minimalizovaným oknem</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Pro vytvářený záznam použít ikonu skupiny, do které spadá</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Klávesová zkratka pro všeobecné automatické vyplňování</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Neoznačovat databázi jako upravenou při změnách, nepostihujících údaje (např. rozšíření skupin)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Jazyk</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,66 +3598,60 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
         <translation>Minimalizovat okno aplikace do oznamovací oblasti systémového panelu</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Při spouštění aplikace načíst minule otevřené databáze</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>V případě úpravy zvenčí, automaticky opětovně načíst databázi</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Namísto ukončení aplikace skrýt její okno do oznamovací oblasti systémového panelu</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Spouštět aplikaci s minimalizovaným oknem</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Základní nastavení</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Pamatovat si minule použité soubory s klíči a zabezpečovací klíčenky</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Neoznačovat databázi jako upravenou při změnách, nepostihujících údaje (např. rozšíření skupin)</translation>
+        <source>Language</source>
+        <translation>Jazyk</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Automatické vyplňování</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Použít titulek záznamu a URL adresu pro hledání shod s okny pro globální automatické vyplňování</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Vždy se zeptat před provedením automatického vyplnění</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Klávesová zkratka pro všeobecné automatické vyplňování</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Prodleva automatického vyplnění</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Spouštět pouze jedinou instanci KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Časové limity</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Vymazat obsah schránky po uplynutí</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>sek.</translation>
     </message>
     <message>
@@ -2187,8 +3659,12 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
         <translation>Uzamknout databázi při nečinnosti delší než</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Hesla vždy viditelná (nezakrývat hvězdičkami)</translation>
+        <source>Convenience</source>
+        <translation>Pohodlí</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Zamknout databáze když je zamčena relace nebo je zavřeno víko notebooku</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2199,16 +3675,16 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
         <translation>Pokud je viditelné, nevyžadovat zopakování zadání hesla</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Časové limity</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Hesla vždy viditelná (nezakrývat hvězdičkami)</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Pohodlí</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Zamknout databáze když je zamčena relace nebo je zavřeno víko notebooku</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2230,6 +3706,14 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
         <translation>Klíč:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Použít vlastní nastavení</translation>
     </message>
@@ -2255,6 +3739,7 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>sek.</translation>
     </message>
 </context>
@@ -2322,88 +3807,40 @@ neopakující se název pro identifikaci a potvrďte ho.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>umístění vlastního souboru s nastaveními</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>soubor s klíčem k databázi</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – aplikace pro správu hesel, fungující na vícero operačních systémech</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>načíst heslo k databázi ze standardního vstupu</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>soubory s databázemi hesel k otevření (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Zkopírovat heslo do schránky</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Umístění databáze.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Použít grafickou výzvu pro odemykání databáze.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Název záznamu který oříznout.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Vytáhnout a vypsat obsah databáze.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Umístění extrahované databáze.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Název příkazu ke spuštění.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Vypsat položky databáze.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Umístění seznamu skupin. Výchozí je /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Vypsat univerzálně jedinečné identifikátory záznamů a skupin.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Sloučit dvě databáze.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – aplikace pro správu hesel, fungující na vícero operačních systémech</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Umístění sloučené databáze.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>soubory s databázemi hesel k otevření (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Umístění výchozí databáze.</translation>
+        <source>path to a custom config file</source>
+        <translation>umístění vlastního souboru s nastaveními</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Pro oba databázové soubory použít shodné heslo.</translation>
+        <source>key file of the database</source>
+        <translation>soubor s klíčem k databázi</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Zobrazit heslo.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>načíst heslo k databázi ze standardního vstupu</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Název položky k zobrazení.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_de.ts b/share/translations/keepassx_de.ts
index f3bd0e39f..0351d9e4b 100644
--- a/share/translations/keepassx_de.ts
+++ b/share/translations/keepassx_de.ts
@@ -10,14 +10,34 @@
         <translation>Über</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Melden Sie Bugs auf: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC wird unter den Bedingungen der GNU General Public License (GPL) Version 2 oder Version 3 (je nach Ihrer Auswahl) vertrieben.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Projekt-Maintainer:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Mitwirkende</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Mitwirkende auf GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Debug-Info</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Geben Sie folgende Informationen an, wenn Sie einen Bug melden:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>In Zwischenablage kopieren</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revision: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribution: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Bibliotheken:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Aktivierte Erweiterungen:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Melden Sie Bugs auf: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC wird unter den Bedingungen der GNU General Public License (GPL) Version 2 oder Version 3 (je nach Ihrer Auswahl) vertrieben.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Projekt-Maintainer:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Mitwirkende auf GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Geben Sie folgende Informationen an, wenn Sie einen Bug melden:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribution: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Zugriff bestätigen</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Diese Entscheidung merken</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 hat Zugriff auf Passwörter für folgende Element(e) angefordert.
 Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Zugriff bestätigen</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>SSH Agent aktivieren (Neustart erforderlich)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Auto-Type - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>Die Syntax Ihres Auto-Type-Befehls ist inkorrekt!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Dieses Auto-Type-Kommando enthält eine sehr lange Verzögerung. Möchten Sie wirklich fortfahren?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Dieses Auto-Type-Kommando enthält sehr langsame Tastendrücke. Möchten Sie wirklich fortfahren?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Dieses Auto-Type-Kommando enthält Argumente, die sehr häufig wiederholt werden. Möchten Sie wirklich fortfahren?</translation>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,293 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Type - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Wählen Sie einen Eintrag für Auto-Type:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser: Zugriff bestätigen</translation>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-Type - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Diese Entscheidung merken</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Erlauben</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Ablehnen</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 hat Zugriff auf Passwörter für folgende Element(e) angefordert.
+Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Dies ist notwendig, um mit KeePassXC-Browser auf Ihre Datenbank zuzugreifen</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>KeePassXC-Browser-Integration aktivieren</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Integration für diese Browser aktivieren:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Be&amp;nachrichtigung anzeigen, wenn Anmeldedaten angefragt werden.</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Verlange Entsperrung, wenn die Datenbank gesperrt ist.</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Nur Einträge mit dem gleichen Schema (http://, https://, …) werden zurückgeliefert.</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>URL-Sche&amp;ma abgleichen (z.B. https://…)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Zeige nur die am besten passenden Einträge für eine URL anstatt aller Einträge der ganzen Domäne.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>Nur am &amp;besten passende Anmeldedaten zurückliefern</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Passende Anmeldedaten nach &amp;Titel sortieren</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Passende Anmeldedaten nach &amp;Nutzername sortieren</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>Alle Browser &amp;abmelden</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>Alle gemerkten Berechtigungen &amp;vergessen</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Fortgeschritten</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Niemals &amp;fragen, bevor auf Anmeldedaten zugegriffen wird</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Niemals fragen, bevor Anmeldedaten a&amp;ktualisiert werden.</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Nur die ausgewählte Datenbank muss mit dem Client verbunden sein.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Suc&amp;he in allen geöffneten Datenbanken nach passenden Anmeldedaten</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatisches Erstellen und Aktualisieren von erweiterten Attributen wird nicht unterstützt!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Zeige auch erweiterte Attribute, welche mit &quot;KPH: &quot; beginnen</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation>Aktualisiert den KeePassXC- oder KeePassXC-Proxy-Pfad automatisch in den Native-Messaging-Skripts beim Start.</translation>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation>Native-Messaging-Manifeste beim Start aktualisieren</translation>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>Proxy-Anwendung zwischen KeePassXC und Browser-Erweiterung unterstützen</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation>Verwende eine &amp;Proxy-Anwendungen zwischen KeePassXC und Browser-Erweiterung</translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation>Verwende benutzerdefinierten Proxy-Pfad, falls Proxy manuell installiert wurde.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Verwende &amp;benutzerdefinierten Proxy-Pfad</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Durchsuchen...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Warnung:&lt;/b&gt; Die folgenden Optionen können gefährlich sein!</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Ausführbare Dateien (*.exe);;Alle Dateien (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>Ausführbare Dateien (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Benutzerdefinierten Proxy-Pfad auswählen</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Neue Schlüsselverbindungsanfrage</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation>Sie haben eine neue Verbindungsanfrage für den obigen Schlüssel.
+
+Wenn Sie Zugriff auf Ihre KeePassXC-Datenbank zulassen wollen,
+vergeben Sie bitte einen eindeutigen Namen und akzeptieren diese.</translation>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Speichern und Zugriff erlauben</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Bestehenden Schlüssel überschreiben?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Ein geteilter Schlüssel mit dem Namen „%1“ existiert bereits.
+Möchten Sie diesen überschreiben?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Eintrag aktualisiert</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Möchten Sie wirklich die Informationen in %1 - %2 aktualisieren?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Datenbank gesperrt!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Die aktive Datenbank ist gesperrt!
+Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Einstellung nicht verfügbar!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation>Die aktive Datenbank enthält keinen Einstellungseintrag.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Kein Schlüssel gefunden</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation>Kein geteilter Schlüssel in den KeePassXC-Einstellungen gefunden.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Schlüssel aus der Datenbank entfernt</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Es wurde erfolgreich %n Schlüssel aus den KeePassXC-Einstellungen entfernt.</numerusform><numerusform>Es wurden erfolgreich %n Schlüssel aus den KeePassXC-Einstellungen entfernt.</numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Entferne gespeicherte Berechtigungen...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Zugangsdaten entfernt</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Eintrag entfernt.</numerusform><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Einträgen entfernt.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Kein Eintrag mit Zugangsdaten gefunden!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>The aktive Datenbank enthält keinen Eintrag mit Zugangsdaten.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +457,10 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Passwort wiederholen:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Schlüsseldatei</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Durchsuchen</translation>
     </message>
@@ -157,6 +469,14 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Erstellen</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Cha&amp;llenge-Response</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Neu laden</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Schlüsseldateien</translation>
     </message>
@@ -177,6 +497,10 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Schlüsseldatei auswählen</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Leeres Passwort</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Wollen Sie wirklich eine leere Zeichenkette als Passwort verwenden?</translation>
     </message>
@@ -190,24 +514,21 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Festlegen von %1 als Schlüsseldatei nicht möglich: %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Schlüsseldatei</translation>
+        <source>Legacy key file format</source>
+        <translation>Veraltetes Schlüsseldatei-Format</translation>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge-Response</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Neu laden</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Leeres Passwort</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft evtl. nicht mehr unterstützt wird.
+
+Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</translation>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Ändern des Hauptschlüssels fehlgeschlagen: kein YubiKey eingesteckt.</translation>
+        <translation>Ändern des Master-Passworts fehlgeschlagen: kein YubiKey eingesteckt.</translation>
     </message>
 </context>
 <context>
@@ -217,6 +538,10 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Klon-Optionen</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>„ - Klon“ zum Titel hinzufügen</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Benutzernamen und Passwort mit Referencen ersetzen</translation>
     </message>
@@ -224,10 +549,6 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <source>Copy history</source>
         <translation>Verlauf kopieren</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>„ - Klon“ zum Titel hinzufügen</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -324,38 +645,34 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>CSV-Datei importieren</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Fehler</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Berechnung des Hauptschlüssels gescheitert</translation>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
     </message>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>Byte,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n Byte</numerusform><numerusform>%n Bytes</numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>Zeilen,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n Zeile,</numerusform><numerusform>%n Zeilen,</numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>Spalten</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n Spalte</numerusform><numerusform>%n Spalten</numerusform></translation>
     </message>
 </context>
 <context>
     <name>DatabaseOpenWidget</name>
     <message>
         <source>Enter master key</source>
-        <translation>Hauptschlüssel eingeben</translation>
+        <translation>Master-Passwort eingeben</translation>
     </message>
     <message>
         <source>Key File:</source>
@@ -370,14 +687,39 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Durchsuchen</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Neu laden</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Challenge-Response</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank nicht möglich.</translation>
+        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
         <translation>Schlüsseldatei kann nicht geöffnet werden</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation>Veraltetes Schlüsseldatei-Format</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft evtl. nicht mehr unterstützt wird.
+
+Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Diese Warnungen nicht wieder anzeigen</translation>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Alle Dateien</translation>
     </message>
@@ -389,14 +731,6 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <source>Select key file</source>
         <translation>Schlüsseldatei auswählen</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Neu laden</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Challenge-Response</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -413,12 +747,12 @@ Bitte wählen Sie, ob Sie den Zugriff erlauben möchten.</translation>
         <translation>Schlüsseldatei kann nicht geöffnet werden</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Datenbank wurde ordnungsgemäß geöffnet. Es gibt nichts zu tun.</translation>
+        <source>Unable to open the database.</source>
+        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank nicht möglich.</translation>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Datenbank wurde ordnungsgemäß geöffnet. Es gibt nichts zu tun.</translation>
     </message>
     <message>
         <source>Success</source>
@@ -438,40 +772,61 @@ sie kann nun gespeichert werden.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Datenbankname:</translation>
+        <source>General</source>
+        <translation>Allgemein</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Datenbankbeschreibung:</translation>
+        <source>Encryption</source>
+        <translation>Verschlüsselung</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Verschlüsselungsdurchläufe:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Anzahl Runden zu hoch</translation>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Standardbenutzername:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation>Sie verwenden eine sehr hohe Rundenanzahl mit Argon2.
+
+Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank Stunden oder Tage (oder noch länger) zum Öffnen benötigen.</translation>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation>Verstanden, Anzahl beibehalten</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Benchmark</translation>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Max. Einträge im Verlauf:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Anzahl Runden zu niedrig</translation>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Max. Verlaufsgröße:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation>Sie verwenden eine sehr niedrige Rundenanzahl mit AES-KDF.
+
+Wenn Sie diese Anzahl beibehalten, könnte Ihre Datenbank zu einfach zu knacken sein!</translation>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Papierkorb verwenden</translation>
+        <source>KDF unchanged</source>
+        <translation>KDF unverändert</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Konnte Schlüssel nicht mit den neuen KDF-Parametern transformieren; KDF unverändert.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Verschlüsselungs-Algorithmus.</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -482,14 +837,78 @@ sie kann nun gespeichert werden.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algorithmus:</translation>
+        <source>Key Derivation Function:</source>
+        <translation>Schlüssel-Ableitungsfunktion</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Verschlüsselungsdurchläufe:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>1-Sekunden-Verzögerung messen</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Speicher-Verbrauch</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Parallelität:</translation>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation>Thread</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Datenbank-Metadaten</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Datenbankname:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Datenbankbeschreibung:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Standardbenutzername:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Verlaufseinstellungen</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Max. Einträge im Verlauf:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Max. Verlaufsgröße:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Papierkorb verwenden</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Root</translation>
     </message>
     <message>
@@ -509,22 +928,48 @@ sie kann nun gespeichert werden.</translation>
         <translation>Datei nicht gefunden!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 Datenbank öffnen</translation>
+        <source>Unable to open the database.</source>
+        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 Datenbank</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Datei ist schreibgeschützt</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>CSV-Datei öffnen</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV-Datei</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Alle Dateien (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Datenbank zusammenführen</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1-Datenbank öffnen</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1-Datenbank</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Schließen?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; wird bearbeitet.
+Änderungen verwerfen und trotzdem schließen?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Änderungen speichern?</translation>
     </message>
@@ -539,8 +984,20 @@ Save changes?</source>
         <translation>Schreiben der Datenbank fehlgeschlagen.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Passwörter</translation>
+    </message>
+    <message>
         <source>Save database as</source>
-        <translation>Datenbank speichern unter</translation>
+        <translation>Datenbank speichern als</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>Datenbank als CSV-Datei exportieren.</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Die CSV Datei konnte nicht gespeichert werden.</translation>
     </message>
     <message>
         <source>New database</source>
@@ -561,12 +1018,6 @@ Please press cancel to finish your changes or discard them.</source>
 Wählen sie „Abbrechen“, um die Änderungen zu speichern oder sie zurückzunehmen.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Diese Datenbank wurde noch nicht gespeichert.
-Sie können sie speichern oder die Sperre freigeben.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -574,72 +1025,16 @@ Otherwise your changes are lost.</source>
 Soll sie gespeichert werden bevor sie gesperrt wird?
 Anderenfalls gehen Ihre Änderungen verloren.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; wird bearbeitet.
-Änderungen verwerfen und trotzdem schließen?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Datenbank als CSV-Datei exportieren.</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV-Datei</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Die CSV Datei konnte nicht gespeichert werden.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Datenbank zusammenführen</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Die Datenbank, die gespeichert werden soll, wird von einer anderen KeePassXC-Instanz verwendet.
-Soll sie dennoch gespeichert werden? </translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Passwörter</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Datenbank bereits geöffnet</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Die Datenbank, die Sie versuchen, zu öffnen, wird bereits von einer anderen KeePassXC-Instanz verwendet.
-
-Möchten Sie diese dennoch öffnen?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Schreibgeschützt öffnen</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Datei ist schreibgeschützt</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>CSV-Datei öffnen</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Suche…</translation>
+    </message>
+    <message>
         <source>Change master key</source>
-        <translation>Hauptschlüssel ändern</translation>
+        <translation>Master-Passwort ändern</translation>
     </message>
     <message>
         <source>Delete entry?</source>
@@ -658,36 +1053,44 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Wollen Sie die Einträge &quot;%1&quot; wirklich löschen?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Eintrag in den Papierkorb verschieben?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Möchten Sie wirklich den Eintrag &quot;%1&quot; in den Papierkorb verschieben?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Einträge in den Papierkorb verschieben?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Wollen Sie wirklich %n Eintrag in den Papierkorb verschieben?</numerusform><numerusform>Wollen Sie wirklich %n Einträge in den Papierkorb verschieben?</numerusform></translation>
+        <translation><numerusform>Möchten Sie wirklich %n Eintrag aus dem Papierkorb löschen?</numerusform><numerusform>Möchten Sie wirklich %n Einträge aus dem Papierkorb löschen?</numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Gruppe löschen?</translation>
+        <source>Execute command?</source>
+        <translation>Befehl ausführen?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Wollen Sie die Gruppe &quot;%1&quot; wirklich löschen?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Folgenden Befehl ausführen? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Berechnung des Hauptschlüssels gescheitert</translation>
+        <source>Remember my choice</source>
+        <translation>Meine Auswahl merken</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Eintrag in den Papierkorb verschieben?</translation>
+        <source>Delete group?</source>
+        <translation>Gruppe löschen?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Möchten Sie wirklich den Eintrag &quot;%1&quot; in den Papierkorb verschieben?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Wollen Sie die Gruppe &quot;%1&quot; wirklich löschen?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Suche…</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -706,20 +1109,8 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Keine Ergebnisse</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Befehl ausführen?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Folgenden Befehl ausführen? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Meine Auswahl merken</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Automatisches Neuladen angefordert</translation>
+        <source>File has changed</source>
+        <translation>Datei hat sich geändert</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -730,8 +1121,10 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Zusammenführungsanfrage</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Die Datenbankdatei wurde geändert und Sie haben noch nicht gespeicherte Änderungen. Wollen Sie Ihre Änderungen zusammenführen?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>Die Datenbank wurde verändert und Sie haben nicht gespeicherte Änderungen.
+Möchten Sie Ihre Änderungen zusammenführen?</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -747,6 +1140,89 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP-Token generieren</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Schließen</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Ablaufdatum</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Benutzername</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Suche</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attribute</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anhänge</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notizen</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Fenster</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequenz</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Suche</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Niemals</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[GESCHÜTZT]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Deaktiviert</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Aktiviert</translation>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -773,6 +1249,30 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Verlauf</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH-Agent</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n. a.</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(verschlüsselt)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Privatschlüssel auswählen</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Datei zu groß, um ein Privatschlüssel zu sein</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Privatschlüsel konnte nicht geöffnet werden</translation>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Eintragsverlauf</translation>
     </message>
@@ -786,28 +1286,27 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Unterschiedliche Passwörter eingegeben.</translation>
+        <translation>Passwörter sind unterschiedlich</translation>
     </message>
     <message>
         <source>New attribute</source>
         <translation>Neue Eigenschaft</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Datei wählen</translation>
+        <source>Confirm Remove</source>
+        <translation>Entfernen bestätigen</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Öffnen der Datei nicht möglich</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Sind Sie sicher, dass Sie dieses Attribut entfernen möchten?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Anhang speichern</translation>
+        <source>[PROTECTED]</source>
+        <translation>[GESCHÜTZT]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Speichern des Anhangs nicht möglich:</translation>
+        <source>Press reveal to view or edit</source>
+        <translation>Klicken zum Anzeigen oder Bearbeiten</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -815,32 +1314,16 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n Woche</numerusform><numerusform>%n Woche(n)</numerusform></translation>
+        <translation><numerusform>%n Woche</numerusform><numerusform>%n Wochen</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n Monat</numerusform><numerusform>%n Monat(en)</numerusform></translation>
+        <translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 Jahr</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Entfernen bestätigen</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Sind Sie sicher, dass Sie dieses Attribut entfernen möchten?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[GESCHÜTZT] Klicken Sie „Zeigen“ zum Anzeigen oder Bearbeiten</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Sind Sie sicher, dass Sie diesen Anhang löschen wollen?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -857,18 +1340,6 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Entfernen</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Anhänge</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Speichern</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Offen</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Namen bearbeiten</translation>
     </message>
@@ -880,6 +1351,10 @@ Möchten Sie diese dennoch öffnen?</translation>
         <source>Reveal</source>
         <translation>Zeigen</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anhänge</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -888,6 +1363,18 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Auto-Type für diesen Eintrag aktivieren</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Standard-Auto-Type-Sequenz der &amp;Gruppe erben</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Ben&amp;utzerdefinierte Auto-Type-Sequenz verwenden:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Fenster-Einstellungen</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -900,14 +1387,6 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Fenstertitel:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Standard-Auto-Type-Sequenz der &amp;Gruppe erben</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Ben&amp;utzerdefinierte Auto-Type-Sequenz verwenden:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Standardse&amp;quenz verwenden</translation>
     </message>
@@ -915,10 +1394,6 @@ Möchten Sie diese dennoch öffnen?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>B&amp;enutzerdefinierte Sequenz:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Fenster-Einstellungen</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -942,12 +1417,8 @@ Möchten Sie diese dennoch öffnen?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Titel:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Benutzername:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -958,20 +1429,104 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Wiederholen:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Titel:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Verfällt</translation>
+        <source>Notes</source>
+        <translation>Notizen</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Vorgaben</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notizen:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>Klicken Sie das Kontrollkästchen, um die Notizen anzuzeigen.</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Benutzername:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Verfällt</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Entferne Schlüssel vom Agenten nach</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>Sekunden</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Fingerabdruck</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>Entferne Key vom Agenten wenn Datenbank geschlossen wird</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Öffentlicher Schlüssel</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Key zum Agenten hinzufügen, wenn Datenbank geöffnet / entsperrt wird</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Kommentar</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Entschlüsseln</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n. a.</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>In Zwischenablage kopieren</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Privatschlüssel</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Externe Datei</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Durchsuchen...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Anhang</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Zum Agent hinzufügen</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Aus Agent löschen</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Verlange Benutzer-Bestätigung, wenn Schlüssel verwendet wird.</translation>
     </message>
 </context>
 <context>
@@ -1021,7 +1576,7 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
     <message>
         <source>Expires</source>
-        <translation>Erlischt</translation>
+        <translation>Verfällt</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1043,6 +1598,14 @@ Möchten Sie diese dennoch öffnen?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Standardsymbol verwenden</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>B&amp;enutzerdefiniertes Symbol verwenden</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Eigenes Symbol hinzufügen</translation>
     </message>
@@ -1051,6 +1614,18 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Eigenes Symbol löschen</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Favicon herunterladen</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Abrufen des Favicons nicht möglich</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Tipp: Sie können Google als Fallback festlegen unter Werkzeuge&gt;Einstellungen&gt;Sicherheit</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Bilder</translation>
     </message>
@@ -1063,24 +1638,12 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Bild auswählen</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Favicon herunterladen</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Abrufen des Favicons nicht möglich</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Icon kann nicht gelesen werden</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Standardsymbol verwenden</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>B&amp;enutzerdefiniertes Symbol verwenden</translation>
+        <source>Custom icon already exists</source>
+        <translation>Es gibt bereits ein eigenes Symbol </translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1090,14 +1653,6 @@ Möchten Sie diese dennoch öffnen?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Dieses Icon wird noch von %1 Einträgen verwendet und würde mit dem Standard-Icon ersetzt. Sind Sie sicher, dass die fortfahren wollen?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tipp: Sie können Google als Fallback festlegen unter Werkzeuge&gt;Einstellungen&gt;Sicherheit</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Es gibt bereits ein eigenes Symbol </translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1122,10 +1677,98 @@ Möchten Sie diese dennoch öffnen?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Klon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Größe</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Hinzufügen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Entfernen</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Offen</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Speichern</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Dateien auswählen</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>Sind Sie sicher, dass sie einen Anhang löschen möchten?</numerusform><numerusform>Sind Sie sicher, dass sie %n Anhänge löschen möchten?</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Entfernen bestätigen</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Anhänge speichern</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Konnte Verzeichnis nicht erstellen:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>Sind Sie sicher, dass sie die existierende Datei „%1“ mit dem Anhang überschreiben wollen?</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Überschreiben bestätigen</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Speichern der Anhänge nicht möglich:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Öffnen des Anhangs nicht möglich:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Öffnen des Anhangs nicht möglich:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>Öffnen der Datei nicht möglich</translation>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1154,6 +1797,11 @@ Möchten Sie diese dennoch öffnen?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Gruppe</translation>
     </message>
@@ -1169,11 +1817,6 @@ Möchten Sie diese dennoch öffnen?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1183,6 +1826,17 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Datei konnte nicht gespeichert werden!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Speichern des Native-Messaging-Skripts nicht möglich.</translation>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1245,6 +1899,361 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Fehler beim Ausführen des Challenge-Response-Verfahrens</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Falscher Schlüssel oder die Datenbank ist beschädigt.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Fehler beim Ausführen des Challenge-Response-Verfahrens</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>fehlende Datenbank-Header</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Ungültige Größe der Header-Prüfsumme</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Ungültige SHA256-Prüfsumme für Header</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Falscher Schlüssel oder Datei ist beschädigt (ungültiger HMAC)</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Unbekannter Verschlüsselungsalgorithmus</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Ungültige Größe der Header-ID</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Ungültiger Header-Feldlänge</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Ungültige Header-Datenlänge</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation>Konnte Puffer mit KDF-Parametern im Header nicht öffnen</translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation>Nicht unterstützte Schlüssel-Ableitungsfunktion (KDF) oder ungültige Parameter</translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation>Veraltete Header-Felder in KDBX4-Datei gefunden.</translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>Ungültige Größer der Inner-Header-ID</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation>Ungültige Inner-Header-Feldlänge</translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation>Ungültige Inner-Header-Binärgröße</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige KeePass-Variant-Map-Version</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Variant-Map-Eintragsdaten</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Variant-Map-Eintragsdaten</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Bool Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Int32 Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige UInt32 Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige Int64 Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültige UInt64 Variant-Map-Eintragslänge</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Ungültiger Variant-Map-Eintragstyp</translation>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Falsche Feldgröße für Variant-Map-Feldtyp</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation>Ungültiger symmetrischer Verschlüsselungsalgorithmus</translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Ungültige symmetrische Verschlüsselungs-IV-Größe</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>KDF-Parameter aus Variant-Map konnten nicht serialisiert werden</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation>Ungültige Länge der Algorithmus-UUID</translation>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation>Nicht unterstützter Verschlüsselungsalgorithmus</translation>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>Ungültige Kompressions-Flag-Fänge</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Nicht unterstützter Kompressionsalgorithmus</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation>Ungültige Master-Seed-Länge</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Ungültige Transform-Seed-Länge</translation>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation>Ungültige Transformations-Runden-Länge</translation>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation>Ungültige Start-Byte-Länge</translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation>Ungültige Random-Stream-ID-Länge</translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation>Ungültige Inner-Random-Stream-Cipher</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Keine KeePass-Datenbank.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Die ausgewählte Datei ist eine alte KeePass 1-Datenbank (.kdb).
+
+Zum Importieren gehen Sie auf Datenbank &gt; &apos;KeePass 1-Datenbank importieren...&apos;.
+Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann später nicht mehr mit der alten KeePassX-Version 0.4 geöffnet werden.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>Nicht unterstützte KeePass 2-Datenbank-Version</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>XML-Parser-Fehler: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>Keine Root-Gruppe</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation>Fehlende Icon-UUID oder -Daten</translation>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation>Fehlender benutzerdefinierter Datenschlüssel oder -wert</translation>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation>Mehrere Gruppen-Elemente</translation>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation>Nicht gesetzte Gruppen-UUID</translation>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation>Ungültige Gruppen-Icon-Anzahl</translation>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>Ungültiger Wert für EnableAutoType</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation>Ungültiger Wert für EnableSearching</translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>Keine Gruppen-UUID gefunden</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation>Fehlende DeleteObject-UUID</translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation>Fehlende DeletedObject-UUID oder -Zeit</translation>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation>Fehlende Eintrags-UUID</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation>Ungültige Eintrags-Icon-Anzahl</translation>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation>Verlaufselement in Eintragsverlauf</translation>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation>Keine Eintrags-UUID gefunden</translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation>Verlaufselement mit anderer UUID</translation>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation>Eintrags-Zeichenfolge konnte nicht entschlüssel werden</translation>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation>Doppelte Benutzerattribut gefunden</translation>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation>Eintrags-Schlüssel oder -Wert fehlt</translation>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation>Doppelter Anhang gefunden</translation>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation>Eintrags-Binärschlüssel oder -Wert fehlt</translation>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation>Auto-Type-Fensterangabe oder -Sequenz fehlt</translation>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>Ungültiger Bool-Wert</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>Ungültiger Datums-Zeit-Wert</translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Ungültiger Farbwert</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation>Ungültiger RGB-Farbteil</translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>Ungültiger Zahlwert</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>Ungültiger UUID-Wert</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation>Binärdatei konnte nicht dekomprimiert werden</translation>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1252,7 +2261,7 @@ Möchten Sie diese dennoch öffnen?</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Öffnen der Datenbank nicht möglich.</translation>
+        <translation>Öffnen der Datenbank ist nicht möglich.</translation>
     </message>
 </context>
 <context>
@@ -1274,140 +2283,181 @@ Möchten Sie diese dennoch öffnen?</translation>
         <translation>Nicht unterstützte KeePass-Datenbankversion.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Verschlüsselungs-IV konnte nicht gelesen werden</translation>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>Ungültige Anzahl Gruppen</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation>Ungültige Anzahl Einträge</translation>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation>Ungültige Inhalts-Hashlänge</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Ungültige Transform-Seed-Länge</translation>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation>Ungültige Anzahl Transform-Runden</translation>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation>Gruppen-Baum konnte nicht erzeugt werden</translation>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Root</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Berechnung des Hauptschlüssels gescheitert</translation>
+        <translation>Berechnung des Master-Passworts gescheitert</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Falscher Schlüssel oder die Datenbank ist beschädigt.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Keine KeePass-Datenbank.</translation>
+        <source>Key transformation failed</source>
+        <translation>Schlüssel-Transformation fehlgeschlagen</translation>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Nicht unterstützte KeePass-Datenbankversion.</translation>
+        <source>Invalid group field type number</source>
+        <translation>Ungültige Gruppen-Typanzahl</translation>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Falscher Schlüssel oder die Datei ist beschädigt.</translation>
+        <source>Invalid group field size</source>
+        <translation>Falsche Feldgröße für Gruppe</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Berechnung des Hauptschlüssels gescheitert</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation>Falsche Feldgröße für Gruppenfeld</translation>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Fehler beim Ausführen des Challenge-Response-Verfahrens</translation>
+        <source>Incorrect group id field size</source>
+        <translation>Falsche Feldgröße für Gruppen-ID</translation>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Die ausgewählte Datei ist eine alte KeePass 1-Datenbank (.kdb).
-
-Zum Importieren gehen Sie auf Datenbank &gt; &apos;KeePass 1-Datenbank importieren...&apos;.
-Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann später nicht mehr mit der alten KeePassX-Version 0.4 geöffnet werden.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation>Falsche Feldgröße für Gruppen-Erstellungs-Zeit</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Fehler beim Ausführen des Challenge-Response-Verfahrens</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation>Falsche Feldgröße für Gruppen-Änderungszeit</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Berechnung des Hauptschlüssels gescheitert</translation>
+        <source>Incorrect group access time field size</source>
+        <translation>Falsche Feldgröße für Gruppen-Zugriffszeit</translation>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fataler Fehler beim Testen der kryptografischen Funktionen.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation>Falsche Feldgröße für Gruppen-Verfallszeit</translation>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Fehler</translation>
+        <source>Incorrect group icon field size</source>
+        <translation>Falsche Feldgröße für Gruppen-Icon</translation>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Lock-Datei konnte nicht erstellt werden. Einzelinstanzmodus ist deaktiviert.</translation>
+        <source>Incorrect group level field size</source>
+        <translation>Falsche Feldgröße für Gruppen-Level</translation>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Eine andere KeePassXC-Instanz läuft bereits</translation>
+        <source>Invalid group field type</source>
+        <translation>Falsche Feldtyp für Gruppe</translation>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Vorhandene einmal-Sperrdatei ist ungültig. Starte neuen Vorgang.  </translation>
+        <source>Missing group id or level</source>
+        <translation>Fehlende Gruppen-ID oder -Level</translation>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Datenbank öffnen</translation>
+        <source>Missing entry field type number</source>
+        <translation>Fehlende Eintragsfeld-Typeanzahl</translation>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Datenbankeinstellungen</translation>
+        <source>Invalid entry field size</source>
+        <translation>Falsche Feldgröße für Eintrag</translation>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Benutzername in die Zwischenablage kopieren</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation>Gelesene Eintrags-Felddaten haben falsche Größe</translation>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Passwort in die Zwischenablage kopieren</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation>Eintrags-UUID hat falsche Größe</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <source>Invalid entry group id field size</source>
+        <translation>Falsche Feldgröße für Eintrags-Gruppen-ID</translation>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Symbolleiste anzeigen</translation>
+        <source>Invalid entry icon field size</source>
+        <translation>Falsche Feldgröße für Eintrags-Icon</translation>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>Nur Lesezugriff</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation>Falsche Feldgröße für Eintrags-Erstellungszeit</translation>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Fenster zeigen / verstecken</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation>Falsche Feldgröße für Eintrags-Änderungszeit</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Datenbank</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation>Falsche Feldgröße für Eintrags-Verfallszeit</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle Dateien</translation>
+        <source>Invalid entry field type</source>
+        <translation>Ungültiger Eintrags-Feldtyp</translation>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Vorhandene einmal-Sperrdatei ist ungültig. Starte neuen Vorgang.  </translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Reparierte Datenbank speichern</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Lock-Datei konnte nicht erstellt werden. Einzelinstanzmodus ist deaktiviert.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Schreiben der Datenbank fehlgeschlagen.</translation>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Eine andere KeePassXC-Instanz läuft bereits</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fataler Fehler beim Testen der kryptografischen Funktionen.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Fehler</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Datenbank</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Zuletzt verwendete Datenbanken</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importieren</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Hilfe</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Ei&amp;nträge</translation>
     </message>
@@ -1416,12 +2466,16 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Feld in &amp;Zwischenablage kopieren</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation>Zeitbasiertes Einmal-Passwort (TOTP)</translation>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Gruppen</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Ansicht</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Werkzeuge</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1432,6 +2486,10 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>&amp;Über</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>Datenbank öffnen...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Datenbank &amp;speichern</translation>
     </message>
@@ -1472,24 +2530,24 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>Gruppe &amp;löschen</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Datenbankeinstellungen</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Datenbank speichern unter...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>Eintrag &amp;klonen</translation>
+        <source>Change &amp;master key...</source>
+        <translation>&amp;Master-Passwort ändern...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Timed One-Time-Passwort</translation>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Datenbankeinstellungen</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>&amp;TOTP kopieren</translation>
+        <source>Database settings</source>
+        <translation>Datenbankeinstellungen</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>TOTP anzeigen</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Eintrag &amp;klonen</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1500,14 +2558,26 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>&amp;Benutzernamen kopieren</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Benutzername in die Zwischenablage kopieren</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Passwort kop&amp;ieren</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Passwort in die Zwischenablage kopieren</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Passwortgenerator</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Auto-Type ausführen</translation>
     </message>
@@ -1524,165 +2594,210 @@ Dieser Vorgang ist nur in eine Richtung möglich. Die importierte Datenbank kann
         <translation>&amp;Titel</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation>Titel in Zwischenablage kopieren</translation>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation>URL in Zwischenablage kopieren</translation>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notizen</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Passwortgenerator</translation>
+        <source>Copy notes to clipboard</source>
+        <translation>Notizen in Zwischenablage kopieren</translation>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Verlauf löschen</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>Als CSV-Datei &amp;exportieren...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Datenbank</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>KeePass 1-Datenbank importieren...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importieren</translation>
+        <source>Import CSV file...</source>
+        <translation>CSV-Datei importieren...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Werkzeuge</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Datenbank repar&amp;ieren...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>TOTP anzeigen</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>TOTP einrichten...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>&amp;TOTP kopieren</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Papierkorb leeren</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>Papierkorb l&amp;eeren</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Verlauf löschen</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Zugriffsfehler für Konfigurations-Datei %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>KeePassXC beenden</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Es sie aus, als ob Sie KeePassHTTP für Browser-Integration nutzen. Dieses Feature is veraltet und wird in Zukunft entfernt. &lt;br&gt;Bitte wechseln Sie zu KeePassXC-Browser! Für Hilfe bei der Migration, lesen Sie unseren &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;Migrations-Leitfaden&lt;/a&gt; (Warnung %1 von 3).</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Bitte drücken Sie den Button Ihres YubiKeys</translation>
+        <source>read-only</source>
+        <translation>Nur Lesezugriff</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Hilfe</translation>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>Datenbank öffnen...</translation>
+        <source>Toggle window</source>
+        <translation>Fenster zeigen / verstecken</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Datenbank speichern unter...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>KeePassXC beenden</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Ha&amp;uptschlüssel ändern...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Datenbank</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>Als CSV-Datei &amp;exportieren...</translation>
+        <source>All files</source>
+        <translation>Alle Dateien</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1-Datenbank importieren...</translation>
+        <source>Open database</source>
+        <translation>Datenbank öffnen</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>CSV-Datei importieren...</translation>
+        <source>Save repaired database</source>
+        <translation>Reparierte Datenbank speichern</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Datenbank repar&amp;ieren...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Schreiben der Datenbank fehlgeschlagen.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>TOTP einrichten...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Bitte drücken Sie den Button Ihres YubiKeys</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Ungültige Schlüsseldatei, OpenSSH-Schlüssel erwartet</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
+        <source>PEM boundary mismatch</source>
+        <translation>Falsche PEM-Boundarys</translation>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Zeig&amp;e eine Benachrichtigung, wenn Anmeldedaten angefordert werden.</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation>Dies ist kein OpenSSH-Schlüssel, nur moderne Schlüssel werden unterstützt</translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sortiere gefundene Einträge nach &amp;Benutzername</translation>
+        <source>Base64 decoding failed</source>
+        <translation>Base64-Dekodierung fehlgeschlagen</translation>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Entferne alle gespeicherten Berechtigungen für Einträge in der aktiven Datenbank</translation>
+        <source>Key file way too small.</source>
+        <translation>Schlüsseldatei ist viel zu klein</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Fortgeschritten</translation>
+        <source>Key file magic header id invalid</source>
+        <translation>Magic-Header-ID der Schlüsseldate ungültig</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>&amp;Zugriff auf Einträge immer erlauben</translation>
+        <source>Found zero keys</source>
+        <translation>Null Schlüssel gefunden</translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>&amp;Aktualisierung von Einträgen immer erlauben</translation>
+        <source>Failed to read public key.</source>
+        <translation>Öffentlicher Schlüssel konnte nicht gelesen werden</translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Suche in allen offenen Datenbanken nach übereinstimmenden Einträgen</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Korrupte Schlüsseldatei, lesen des Privatschlüssels fehlgeschlagen</translation>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-Port:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation>Keine Privatschlüssel-Nutzdaten zum Entschlüsseln</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standard-Port: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation>Unbekannter Verschlüsselungsalgorithmus:</translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Verlange Entsperrung, wenn die Datenbank gesperrt ist.</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation>Versuche, KDF ohne Verschlüsselungsalgorithmus anzuwenden</translation>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sortiere gefundene Einträge nach Titel</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>Passphrase zum Entschlüsseln des Schlüssels benötigt</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC überwacht diesen Port auf 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>Schlüssel-Ableitung fehlgeschlagen, Schlüsseldatei korrupt?</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Privilegierte Ports können nicht überwacht werden</translation>
+        <source>Unknown KDF: </source>
+        <translation>Unbekannte KDF:</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Privilegierte Ports unterhalb von 1024 können nicht überwacht werden.
-Es wird der Standard-Port 19455 verwendet.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>Entschlüsselung fehlgeschlagen, falsche Passphrase?</translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Entferne alle freigegebenen Chiffrierschlüssel aus der aktiven Datenbank</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>Unerwartetes EOF beim Lesen des öffentlichen Schlüssels</translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Zeige auch erweiterte Attribute, welche mit &quot;KPH: &quot; beginnen</translation>
+        <source>Unknown key type: </source>
+        <translation>Unbekannte Schlüsseltyp:</translation>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatisches Erstellen und Aktualisieren von erweiterten Attributen wird nicht unterstützt!</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>Unerwartetes EOF beim Lesen des Privatschlüssels</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Öffentlicher Schlüssel konnte nicht geschrieben werden, da er leer ist</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>Unerwartetes EOF beim Schreiben des öffentlichen Schlüssels</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Privatschlüssel konnte nicht geschrieben werden, da er leer ist</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Unerwartetes EOF beim Schreiben des Privatschlüssels</translation>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1693,6 +2808,15 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>KeePassHTTP-Server aktivieren</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Allgemein</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Zeig&amp;e eine Benachrichtigung, wenn Anmeldedaten angefordert werden.</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Zeige nur die am besten passenden Einträge für eine URL anstatt aller Einträge der ganzen Domäne.</translation>
     </message>
@@ -1701,6 +2825,10 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>Nur beste Treffer anzeigen</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Verlange Entsperrung, wenn die Datenbank gesperrt ist.</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Nur Einträge mit dem gleichen Schema (http://, https://, ftp://, …) anzeigen</translation>
     </message>
@@ -1709,27 +2837,108 @@ Es wird der Standard-Port 19455 verwendet.</translation>
         <translation>URL-Schema verwenden</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Sortiere gefundene Einträge nach &amp;Benutzername</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Sortiere gefundene Einträge nach Titel</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Entferne alle freigegebenen Chiffrierschlüssel aus der aktiven Datenbank</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Entferne alle gespeicherten Berechtigungen für Einträge in der aktiven Datenbank</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Passwortgenerator</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Fortgeschritten</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>&amp;Zugriff auf Einträge immer erlauben</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>&amp;Aktualisierung von Einträgen immer erlauben</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Nur die ausgewählte Datenbank muss mit dem Client verbunden sein.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Die folgenden Optionen können gefährlich sein!
-Ändern Sie diese nur, wenn Sie wissen, was Sie tun.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Suche in allen offenen Datenbanken nach übereinstimmenden Einträgen</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatisches Erstellen und Aktualisieren von erweiterten Attributen wird nicht unterstützt!</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Zeige auch erweiterte Attribute, welche mit &quot;KPH: &quot; beginnen</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP-Port:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Standard-Port: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC überwacht diesen Port auf 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Warnung:&lt;/b&gt; Die folgenden Optionen können gefährlich sein!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;KeePassHTTP ist veraltet und wird in Zukunft nicht mehr unterstützt. &lt;br&gt;Bitte wechseln Sie zu KeePassXC-Browser! Für Hilfe bei der Migration, lesen Sie unseren &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;Migrations-Leitfaden&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Privilegierte Ports können nicht überwacht werden</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Privilegierte Ports unterhalb von 1024 können nicht überwacht werden.
+Es wird der Standard-Port 19455 verwendet.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Passwort:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>Stärke</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>Entropie</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Zeichenarten</translation>
     </message>
@@ -1750,38 +2959,50 @@ Change them only if you know what you are doing.</source>
         <translation>Sonderzeichen</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Erweitertes ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Gleich aussehende Zeichen ausschließen</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Akzeptieren</translation>
+        <source>Pick characters from every group</source>
+        <translation>Zeichen aus allen Gruppen wählen</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Länge:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>Stärke</translation>
+        <source>Passphrase</source>
+        <translation>Passphrase</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>Entropie</translation>
+        <source>Wordlist:</source>
+        <translation>Wortliste</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Länge:</translation>
+        <source>Word Count:</source>
+        <translation>Wort-Anzahl</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Zeichen aus allen Gruppen wählen</translation>
+        <source>Word Separator:</source>
+        <translation>Wort-Trenner</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Generieren</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Akzeptieren</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Schließen</translation>
     </message>
@@ -1799,51 +3020,275 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Schlecht</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Schwach</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Gut</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Ausgezeichnet</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation>Datenbank nicht geöffnet</translation>
+    </message>
     <message>
-        <source>Password</source>
-        <translation>Passwort</translation>
+        <source>Database hash not available</source>
+        <translation>Datenbank-Hash nicht verfügbar</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Erweitertes ASCII</translation>
+        <source>Client public key not received</source>
+        <translation>Öffentlicher Client-Schlüssel nicht empfangen</translation>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Passphrase</translation>
+        <source>Cannot decrypt message</source>
+        <translation>Nachricht konnte nicht entschlüsselt werden</translation>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Wortliste</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation>Timeout oder Verbindung zu KeePassXC fehlgeschlagen</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Wort-Anzahl</translation>
+        <source>Action cancelled or denied</source>
+        <translation>Aktion abgebrochen oder verweigert</translation>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Wort-Trenner</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation>Nachricht konnte nicht entschlüsselt werden oder öffentlicher Schlüssel wurde nicht gefunden. Ist Native-Messaging in KeePassXC aktiviert ?</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
+        <source>KeePassXC association failed, try again</source>
+        <translation>KeePassXC-Verbindung fehlgeschlagen, bitte erneut versuchen</translation>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation>Schlüsselaustausch nicht erfolgreich</translation>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>Schlüssel nicht erkannt</translation>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation>Keine gespeicherten Datenbanken gefunden</translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation>Falsche Aktion</translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation>Leere Nachricht erhalten</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>Keine URL angegeben</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>Keine Anmeldedaten gefunden</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Unbekannter Fehler</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation>Neuen Eintrag zur Datenbank hinzufügen</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Pfad zur Datenbank.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>Schlüsseldatei der Datenbank</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>Pfad</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>Nutzername für den Eintrag</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>Nutzername</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL für den Eintrag</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation>Nach dem Passwort des Eintrags fragen</translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation>Passwort für den Eintrag generieren.</translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation>Länge des generierten Passworts.</translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>Länge</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>Pfad des hinzuzufügenden Eintrags.</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation>Passwort eines Eintrags in die Zwischenablage kopieren.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>Pfad des in die Zwischenablage zu kopierenden Eintrags</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>Zeit in Sekunden, bevor die Zwischenablage geleert wird.</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Einen Eintrag bearbeiten.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Titel für diesen Eintrag.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>Titel</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation>Pfad des zu bearbeitenden Eintrags</translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation>Entropy des Passworts abschätzen</translation>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation>Passwort, für das die Entropie abgeschätzt werden soll.</translation>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation>Fortgeschrittene Analyse des Passworts ausführen.</translation>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Inhalt der Datenbank extrahieren und anzeigen.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Pfad der zu extrahierenden Datenbank.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation>Passwort eingeben, um %1 zu entsperren:</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation>Schlüsseldatei %1: konnte nicht geladen werden: %2</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>WARNUNG: Sie verwenden ein veraltetes Schlüsseldatei-Format, welches in Zukunft evtl. nicht mehr unterstützt wird.
+
+Bitte denken Sie darüber nach, eine neue Schlüsseldatei zu generieren.</translation>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation>
+
+Verfügbare Kommandos:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Name des auszuführenden Befehls.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Datenbankeinträge auflisten.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Pfad der aufzulistenden Gruppe. Standard ist /.</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation>Einträge schnell finden.</translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation>Suchbegriff.</translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Zwei Datenbanken zusammenführen</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Pfad der Datenbank, in die zusammengeführt werden soll.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Pfad der Datenbank aus der zusammengeführt werden soll.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Verwende dieselben Anmeldedaten für beide Datenbankdateien.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>Schlüsseldatei der Datenbank, aus der zusammengeführt werden soll.</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation>Informationen eines Eintrags anzeigen.</translation>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation>Namen der anzuzeigenden Attribute. Diese Option kann mehr als einmal angegeben werden, wobei jedes Attribut in einer eigenen Zeile in der gegebenen Reihenfolge angegeben wird. Wenn keine Attribute angegeben sind, wird eine Zusammenfassung der Standardattribute gegeben.</translation>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>Attribute</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Name des anzuzeigenden Eintrags.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL-Gerät</translation>
@@ -1866,8 +3311,28 @@ Change them only if you know what you are doing.</source>
         <translation>Schließendes Anführungszeichen fehlt</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>INTERN - unget untere Schranke überschritten</translation>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – empfohlen)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1886,14 +3351,22 @@ Change them only if you know what you are doing.</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notizen</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>Zuletzt bearbeitet</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Erstellt</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation>Veraltete Browser-Integration</translation>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Browser-Integration</translation>
     </message>
@@ -1909,6 +3382,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>Passiv</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH-Agent</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1947,8 +3424,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Groß- /Kleinschreibung beachten</translation>
+        <source>Search...</source>
+        <translation>Suche…</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1959,8 +3436,8 @@ Change them only if you know what you are doing.</source>
         <translation>Löschen</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Suche…</translation>
+        <source>Case Sensitive</source>
+        <translation>Groß- /Kleinschreibung beachten</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1970,50 +3447,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Ein freigegebener Chiffrierschlüssel mit dem Namen &quot;%1&quot; existiert schon.
-Möchten Sie ihn überschreiben?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Möchten Sie wirklich die Informationen in %1 - %2 aktualisieren?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Die aktive Datenbank ist gesperrt!
-Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>%1 Verschlüsselungs-%2 erfolgreich aus KeePassXC/HTTP-Einstellungen entfernt.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Kein freigegebener Chiffrierschlüssel in den KeePassHTTP-Einstellungen gefunden.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Die aktive Datenbank enthält keinen Eintrag für KeePassHTTP Einstellungen.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Gespeicherte Berechtigungen werden gelöscht...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Abbrechen</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Berechtigungen wurden erfolgreich aus %1 %2 gelöscht.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>The aktive Datenbank enthält keinen Eintrag mit Zugangsdaten.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Neue Schlüsselverbindungsanfrage</translation>
     </message>
@@ -2031,33 +3464,77 @@ Namen und akzeptieren Sie.</translation>
         <translation>KeePassXC: Bestehenden Schlüssel überschreiben?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Ein freigegebener Chiffrierschlüssel mit dem Namen &quot;%1&quot; existiert schon.
+Möchten Sie ihn überschreiben?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Eintrag aktualisiert</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Möchten Sie wirklich die Informationen in %1 - %2 aktualisieren?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Datenbank gesperrt!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Die aktive Datenbank ist gesperrt!
+Bitte entsperren Sie die ausgewählte Datenbank oder wählen Sie eine andere, die entsperrt ist.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Schlüssel aus der Datenbank entfernt</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation><numerusform>%n Schlüssel erfolgreich aus KeePassXC/HTTP-Einstellungen entfernt.</numerusform><numerusform>%n Schlüssel erfolgreich aus KeePassXC/HTTP-Einstellungen entfernt.</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Kein Schlüssel gefunden</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Kein freigegebener Chiffrierschlüssel in den KeePassHTTP-Einstellungen gefunden.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Einstellung nicht verfügbar!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Die aktive Datenbank enthält keinen Eintrag für KeePassHTTP Einstellungen.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Gespeicherte Berechtigungen werden gelöscht...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Zugangsdaten entfernt</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Eintrag entfernt.</numerusform><numerusform>Gespeicherte Berechtigungen wurden erfolgreich aus %n Einträgen entfernt.</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Kein Eintrag mit Zugangsdaten gefunden!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>The aktive Datenbank enthält keinen Eintrag mit Zugangsdaten.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2081,10 +3558,26 @@ Namen und akzeptieren Sie.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Grundeinstellungen</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Nur eine einzige KeePassXC-Instanz starten</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Letzte Datenbank merken</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Letzte Schlüsseldateien und Sicherheits-Dongles merken</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Letzte Datenbank beim Start laden</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Automatisch speichern beim Schließen</translation>
     </message>
@@ -2093,20 +3586,28 @@ Namen und akzeptieren Sie.</translation>
         <translation>Automatisch nach jeder Änderung speichern</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Datenbank nach externer Änderung automatisch neu laden.</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimieren beim Kopieren in die Zwischenablage</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Fenster beim Programmstart minimieren</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Gruppensymbol für das Erstellen neuer Einträge verwenden</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globale Tastenkombination für Auto-Type</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Datenbank nicht als geändert markieren für geringfügige Änderungen (z.B. Ausklappen von Gruppen)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Sprache</translation>
+        <source>Hide the Details view</source>
+        <translation>Detailansicht verstecken</translation>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2117,66 +3618,60 @@ Namen und akzeptieren Sie.</translation>
         <translation>Fenster verstecken wenn minimiert</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Letzte Datenbank beim Start laden</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Datenbank nach externer Änderung automatisch neu laden.</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Fenster zur Taskleiste minimieren statt das Programm zu beenden</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Fenster beim Programmstart minimieren</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Grundeinstellungen</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Letzte Schlüsseldateien und Sicherheits-Dongles merken</translation>
+        <source>Dark system tray icon</source>
+        <translation>Dunkles Taskleistensymbol</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Datenbank nicht als geändert markieren für geringfügige Änderungen (z.B. Ausklappen von Gruppen)</translation>
+        <source>Language</source>
+        <translation>Sprache</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Auto-Type</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Verwende Eintrags-Titel und URL, um Fenster für globales Auto-Type auszuwählen</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Verwende Eintragstitel, um entsprechende Fenster für globales Auto-Type zu finden</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Verwende URL, um Fenster für globales Auto-Type zu finden.</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Immer vor einem Auto-Type fragen</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globale Tastenkombination für Auto-Type</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Auto-Type-Verzögerung</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Nur eine einzige KeePassXC-Instanz starten</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Timeouts</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Zwischenablage leeren nach</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> sek</translation>
     </message>
     <message>
@@ -2184,8 +3679,12 @@ Namen und akzeptieren Sie.</translation>
         <translation>Datenbank sperren nach einer Inaktivität von</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Passwörter standardmäßig im Klartext anzeigen</translation>
+        <source>Convenience</source>
+        <translation>Komfort</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Datenbank schließen, wenn Sitzung geschlossen oder Deckel zugeklappt wird</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2196,16 +3695,16 @@ Namen und akzeptieren Sie.</translation>
         <translation>Keine erneute Passworteingabe verlangen, wenn das Passwort sichtbar ist.</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeouts</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Passwörter standardmäßig im Klartext anzeigen</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Komfort</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation>Passwörter in Vorschau-Panel verstecken</translation>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Datenbank schließen, wenn Sitzung geschlossen oder Deckel zugeklappt wird</translation>
+        <source>Hide entry notes by default</source>
+        <translation>Eintrags-Notizen standardmäßig verstecken</translation>
     </message>
     <message>
         <source>Privacy</source>
@@ -2227,6 +3726,14 @@ Namen und akzeptieren Sie.</translation>
         <translation>Schlüssel:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation>RFC 6238-Token-Standardeinstellungen</translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation>Steam-Tokeneinstellungen</translation>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Verwende eigene Einstellungen</translation>
     </message>
@@ -2252,6 +3759,7 @@ Namen und akzeptieren Sie.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> sek</translation>
     </message>
 </context>
@@ -2319,88 +3827,40 @@ Namen und akzeptieren Sie.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>Schlüsseldatei der Datenbank</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Plattformübergreifender Passwortmanager</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>Passwort der Datenbank von stdin lesen</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>Dateinamen der zu öffnenden Datenbanken (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Passwort in die Zwischenablage kopieren</translation>
+        <source>Remove an entry from the database.</source>
+        <translation>Eintrag aus der Datenbank entfernen</translation>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Pfad zur Datenbank.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Verwende grafische Eingabeaufforderung zum Entsperren der Datenbank</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Name des in die Zwischenablage zu kopierenden Eintrags.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Inhalt der Datenbank extrahieren und anzeigen.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Pfad der zu extrahierenden Datenbank.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Name des auszuführenden Befehls.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Datenbankeinträge auflisten.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation>Pfad des zu entfernenden Eintrags.</translation>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Pfad der aufzulistenden Gruppe. Standard ist /.</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>UUIDs der Einträge und Gruppen anzeigen.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Zwei Datenbanken zusammenführen</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Plattformübergreifender Passwortmanager</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Pfad der Datenbank, in die zusammengeführt werden soll.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Dateinamen der zu öffnenden Datenbanken (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Pfad der Datenbank aus der zusammengeführt werden soll.</translation>
+        <source>path to a custom config file</source>
+        <translation>Pfad zu einer benutzerdefinierten Konfigurationsdatei</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Verwende gleiches Passwort für beide Datenbank-Dateien.</translation>
+        <source>key file of the database</source>
+        <translation>Schlüsseldatei der Datenbank</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Ein Passwort anzeigen</translation>
+        <source>read password of the database from stdin</source>
+        <translation>Passwort der Datenbank von stdin lesen</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Name des anzuzeigenden Eintrags.</translation>
+        <source>Parent window handle</source>
+        <translation>Eltern-Fenster-Handle</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_el.ts b/share/translations/keepassx_el.ts
index 5224c0242..c6a7f9cf9 100644
--- a/share/translations/keepassx_el.ts
+++ b/share/translations/keepassx_el.ts
@@ -10,14 +10,34 @@
         <translation>Σχετικά</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Αναφέρετε σφάλματα στο: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>Το KeePassXC διανέμεται υπό τους όρους του GNU General Public License (GPL) έκδοση 2 ή (κατά την επιλογή σας) έκδοση 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Συνεισφέροντες</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Δείτε τους Συνεισφέροντες στο GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Πληροφορίες Αποσφαλμάτωσης</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Συμπεριλάβετε τις ακόλουθες πληροφορίες όποτε αναφέρετε κάποιο σφάλμα:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Αντιγραφή στο πρόχειρο</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Αναθεώρηση: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Βιβλιοθήκες:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</source>
         <source>Enabled extensions:</source>
         <translation>Ενεργοποιημένες επεκτάσεις:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Αναφέρετε σφάλματα στο: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>Το KeePassXC διανέμεται υπό τους όρους του GNU General Public License (GPL) έκδοση 2 ή (κατά την επιλογή σας) έκδοση 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Δείτε τους Συνεισφέροντες στο GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Συμπεριλάβετε τις ακόλουθες πληροφορίες όποτε αναφέρετε κάποιο σφάλμα:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Επιβεβαίωση Πρόσβασης</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Να θυμάσαι αυτή την απόφαση</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 έχει ζητήσει πρόσβαση σε κωδικούς για το/τα ακόλουθο/α αντικείμενο/α.
 Παρακαλώ επιλέξετε εάν θέλετε να επιτρέψετε τη πρόσβαση.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Επιβεβαίωση Πρόσβασης</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>Auto-Type - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Αυτόματη-Γραφή</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,288 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Type - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Επιλέξτε καταχώρηση για αυτόματη γραφή:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-Type - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Να θυμάσαι αυτή την απόφαση</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Αποδοχή</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Άρνηση</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 έχει ζητήσει πρόσβαση σε κωδικούς για το/τα ακόλουθο/α αντικείμενο/α.
+Παρακαλώ επιλέξετε εάν θέλετε να επιτρέψετε τη πρόσβαση.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Διάλογος</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Γενικά</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Για προχωρημένους</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Αντικατάσταση τρέχοντος κλειδιού;</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Ενημέρωση Καταχώρησης</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Βάση δεδομένων κλειδωμένη!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Ρυθμισμένες μη διαθέσιμες!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Δε βρεθήκαν κλειδιά</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Κλειδιά αφαιρέθηκαν από τη βάση</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Διακοπή</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Δικαιώματα αφαιρέθηκαν</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Δε βρέθηκε καταχώρηση με δικαιώματα!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -149,6 +452,10 @@ Please select whether you want to allow access.</source>
         <translation>Επαναλάβετε τον κωδικό:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Αρχείο κλειδί</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Αναζήτηση</translation>
     </message>
@@ -157,6 +464,14 @@ Please select whether you want to allow access.</source>
         <translation>Δημιουργία</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Ανανέωση</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Αρχεία κλειδιά</translation>
     </message>
@@ -177,12 +492,16 @@ Please select whether you want to allow access.</source>
         <translation>Επιλέξτε ένα αρχείο κλειδί</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Κενός κωδικός</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Θέλετε στα αλήθεια να χρησιμοποιήσετε μια άδεια σειρά σαν κωδικό;</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Έχετε εισάγει διαφορετικούς κωδικούς.</translation>
+        <translation>Παρέχονται διαφορετικοί κωδικοί.</translation>
     </message>
     <message>
         <source>Failed to set %1 as the Key file:
@@ -190,20 +509,15 @@ Please select whether you want to allow access.</source>
         <translation>Αποτυχία ορισμού του %1 ως αρχείου κλειδιού</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Αρχείο κλειδί</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Ανανέωση</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Κενός κωδικός</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -217,6 +531,10 @@ Please select whether you want to allow access.</source>
         <translation>Κλωνοποίηση Επιλογών</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Αντικατάσταση του ονόματος χρήστη και του κωδικού με παραπομπές</translation>
     </message>
@@ -224,10 +542,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>Αντιγραφή ιστορικού</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -324,10 +638,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Εισαγωγή αρχείου CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Σφάλμα</translation>
     </message>
@@ -338,17 +648,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> byte, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> γραμμές, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> στήλες</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -370,16 +680,39 @@ Please select whether you want to allow access.</source>
         <translation>Αναζήτηση</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Ανανέωση</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Απόκριση Πρόκλησης:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
-        <translation>Αδύνατο να ανοιχτεί η βάση δεδομένων.</translation>
+        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Αποτυχία ανοίγματος αρχείο κλειδιού</translation>
+        <translation>Δεν είναι δυνατό να ανοίξει αρχείο κλειδιού</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>All files</source>
-        <translation>Όλα τα αρχεία </translation>
+        <translation>Όλα τα αρχεία</translation>
     </message>
     <message>
         <source>Key files</source>
@@ -389,14 +722,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>Επιλέξτε αρχείο κλειδί</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Ανανέωση</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Απόκριση Πρόκλησης:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -413,14 +738,14 @@ Please select whether you want to allow access.</source>
         <translation>Δεν είναι δυνατό να ανοίξει αρχείο κλειδιού</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Μια χαρά το άνοιγμα βάσης δεδομένων. Τίποτα να κάνει.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Μια χαρά το άνοιγμα βάσης δεδομένων. Τίποτα να κάνει.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Επιτυχία</translation>
     </message>
@@ -437,40 +762,57 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Όνομα βάσης δεδομένων:</translation>
+        <source>General</source>
+        <translation>Γενικά</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Περιγραφή βάσης δεδομένων:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Μετατρεπόμενοι γύροι:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Προεπιλεγμένο όνομα χρήστη:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Σημείο αναφοράς</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Μέγιστα αντικείμενα ιστορικού:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Μέγιστο μέγεθος ιστορικού:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Χρήση κάδου ανακύκλωσης</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -481,14 +823,78 @@ You can now save it.</source>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Αλγόριθμος:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Μετατρεπόμενοι γύροι:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Όνομα βάσης δεδομένων:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Περιγραφή βάσης δεδομένων:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Προεπιλεγμένο όνομα χρήστη:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Μέγιστα αντικείμενα ιστορικού:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Μέγιστο μέγεθος ιστορικού:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Χρήση κάδου ανακύκλωσης</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Ρίζα</translation>
     </message>
     <message>
@@ -501,29 +907,55 @@ You can now save it.</source>
     </message>
     <message>
         <source>Open database</source>
-        <translation>Άνοιγμα βάσης δεδομένων</translation>
+        <translation>Άνοιγμα Βάσης Δεδομένων</translation>
     </message>
     <message>
         <source>File not found!</source>
         <translation>Αρχείο δεν βρέθηκε!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Άνοιγμα βάσης δεδομένων KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Βάση δεδομένων KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Αρχείο ανοιχτό μόνο για ανάγνωση.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Άνοιγμα αρχείου CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>αρχείο CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Όλα τα αρχεία (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Συγχώνευση βάσης δεδομένων</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Άνοιγμα βάσης δεδομένων KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Βάση δεδομένων KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Κλείσιμο;</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; είναι σε λειτουργεία επεξεργασίας.
+Απόρριψη αλλαγών και κλείσιμο ούτως η άλλως;</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Αποθήκευση αλλαγών;</translation>
     </message>
@@ -538,12 +970,24 @@ Save changes?</source>
         <translation>Εγγραφή της βάσης δεδομένων απέτυχε.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Κωδικοί</translation>
+    </message>
+    <message>
         <source>Save database as</source>
-        <translation>Αποθήκευση βάσης δεδομένων σαν</translation>
+        <translation>Αποθήκευση βάσης δεδομένων ως</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>Εξαγωγή βάσης δεδομένων σε αρχείο CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Γράψιμο στο αρχείο CSV απέτυχε.</translation>
     </message>
     <message>
         <source>New database</source>
-        <translation>Νέα βάση δεδομένων</translation>
+        <translation>Νέα Βάση Δεδομένων</translation>
     </message>
     <message>
         <source>locked</source>
@@ -560,12 +1004,6 @@ Please press cancel to finish your changes or discard them.</source>
 Παρακαλώ πατήστε άκυρο για να αποθηκεύσετε τις αλλαγές σας η να τις απορρίψετε.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Αυτή η βάση δεδομένων δεν έχει αποθηκευτεί ποτέ.
-Μπορείται να την αποθηκεύσετε ή να σταματήσετε να την κλειδώνετε.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -573,69 +1011,14 @@ Otherwise your changes are lost.</source>
 Θέλετε να αποθηκεύσετε τις αλλαγές σας πρίν την κλειδώσετε:
 Αλλιώς οι αλλαγές σας θα χαθούν.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; είναι σε λειτουργεία επεξεργασίας.
-Απόρριψη αλλαγών και κλείσιμο ούτως η άλλως;</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Εξαγωγή βάσης δεδομένων σε αρχείο CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>αρχείο CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Γράψιμο στο αρχείο CSV απέτυχε.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Συγχώνευση βάσης δεδομένων</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Η βάση δεδομένων που προσπαθείτε να αποθηκεύσετε ως είναι κλειδωμένη από μία άλλη διεργασία του KeePassXC.
-Θέλετε να την αποθηκεύσετε ούτως η άλλως;</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Κωδικοί</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Βάση δεδομένων ήδη ανοιχτή</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Η βάση δεδομένων που προσπαθείτε να ανοίξετε είναι κλειδωμένη από μία άλλη διεργασία του KeePassXC.
-Θέλετε να την ανοίξετε ούτως η άλλως;</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Άνοιγμα μόνο για ανάγνωση</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Αρχείο ανοιχτό μόνο για ανάγνωση.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Άνοιγμα αρχείου CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Αναζήτηση...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Αλλαγή πρωτεύοντος κλειδιού</translation>
     </message>
@@ -656,6 +1039,14 @@ Do you want to open it anyway?</source>
         <translation>Θέλετε πραγματικά να διαγράψετε %1 καταχωρήσεις για πάντα;</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Κίνηση εισόδου στον κάδο ανακύκλωσης;</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Θέλετε πραγματικά να κινηθεί εισόδου &quot;%1&quot; στον κάδο ανακύκλωσης;</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Μετακίνηση καταχωρήσεων στο καλάθι των αχρήστων;</translation>
     </message>
@@ -664,28 +1055,28 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Διαγραφή ομάδας;</translation>
+        <source>Execute command?</source>
+        <translation>Εκτέλεση εντολής;</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Θέλετε στα αλήθεια να διαγράψετε την ομάδα &quot;%1&quot; μόνιμα;</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Θέλετε πραγματικά να εκτελέσετε την ακόλουθη εντολή;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+        <source>Remember my choice</source>
+        <translation>Να θυμάσαι αυτή την επιλογή</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Κίνηση εισόδου στον κάδο ανακύκλωσης;</translation>
+        <source>Delete group?</source>
+        <translation>Διαγραφή ομάδας;</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Θέλετε πραγματικά να κινηθεί εισόδου &quot;%1&quot; στον κάδο ανακύκλωσης;</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Θέλετε στα αλήθεια να διαγράψετε την ομάδα &quot;%1&quot; μόνιμα;</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Αναζήτηση...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -704,20 +1095,8 @@ Do you want to open it anyway?</source>
         <translation>Δεν Υπάρχουν Αποτελέσματα</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Εκτέλεση εντολής;</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Θέλετε πραγματικά να εκτελέσετε την ακόλουθη εντολή;&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Να θυμάσαι αυτή την επιλογή</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Αίτημα Αυτόματης Επαναφόρτισης</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -728,8 +1107,9 @@ Do you want to open it anyway?</source>
         <translation>Αίτημα Συγχώνευσης</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Η βάση δεδομένων έχει αλλάξει και έχετε μη αποθηκευμένες αλλαγές. Θέλετε να ενσωματώσετε τις αλλαγές σας;</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -745,6 +1125,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Κλείσιμο</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Γενικά</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Όνομα χρήστη</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Συνημμένα</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Παράθυρο</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Ακολουθία</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Αναζήτηση</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -771,6 +1234,30 @@ Do you want to open it anyway?</source>
         <translation>Ιστορικό</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Ιστορικό καταχωρήσεων</translation>
     </message>
@@ -791,22 +1278,20 @@ Do you want to open it anyway?</source>
         <translation>Νέο χαρακτηριστικό</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Επιλογή αρχείου</translation>
+        <source>Confirm Remove</source>
+        <translation>Επιβεβαίωση Αφαίρεσης</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Αποτυχία ανοίγματος αρχείου</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Είστε σίγουροι ότι θέλετε να αφαιρέσετε αυτό το χαρακτηριστικό.</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Αποθήκευση συνημμένου</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Αποτυχία αποθήκευσης συνημμένου.
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -824,22 +1309,6 @@ Do you want to open it anyway?</source>
         <source>1 year</source>
         <translation>1 χρόνο</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Επιβεβαίωση Αφαίρεσης</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Είστε σίγουροι ότι θέλετε να αφαιρέσετε αυτό το χαρακτηριστικό.</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[ΠΡΟΣΤΑΤΕΥΜΕΝΟ] Πατήστε αποκάλυψη για προβολή ή επεξεργασία</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Είστε σίγουροι ότι θέλετε να αφαιρέσετε αυτό το συνημμένο;</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -856,18 +1325,6 @@ Do you want to open it anyway?</source>
         <translation>Αφαίρεση</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Συνημμένα</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Αποθήκευση</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Άνοιγμα</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Επεξεργασία Ονόματος</translation>
     </message>
@@ -879,6 +1336,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>Αποκάλυψη</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Συνημμένα</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -887,6 +1348,18 @@ Do you want to open it anyway?</source>
         <translation>Ενεργοποίηση Αυτόματης-Γραφής για αυτήν την καταχώρηση</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Κληρονόμηση προεπιλεγμένης ακολουθίας Auto-Type από την &amp;ομάδα</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Χρήση προσαρμοσμένης ακολουθίας Auto-Type:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -899,14 +1372,6 @@ Do you want to open it anyway?</source>
         <translation>Τίτλος Παραθύρου:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Κληρονόμηση προεπιλεγμένης ακολουθίας Auto-Type από την &amp;ομάδα</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Χρήση προσαρμοσμένης ακολουθίας Auto-Type:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation type="unfinished"/>
     </message>
@@ -914,10 +1379,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>Χρήση προεπιλε&amp;γμένης ακολουθίας:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -941,12 +1402,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Τίτλος:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Όνομα χρήστη:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -957,20 +1414,104 @@ Do you want to open it anyway?</source>
         <translation>Επαναλάβετε:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Τίτλος:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Λήγει</translation>
+        <source>Notes</source>
+        <translation>Σημειώσεις</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Προεπιλογές</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Σημειώσεις:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Όνομα χρήστη:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Λήγει</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Αντιγραφή στο πρόχειρο</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -993,7 +1534,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Edit group</source>
-        <translation>Επεξεργασία ομάδας</translation>
+        <translation>Επεξεργασία Ομάδας</translation>
     </message>
     <message>
         <source>Enable</source>
@@ -1042,6 +1583,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Χρήση προεπιλεγμένου εικονιδίου</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Χρήση προσαρμο&amp;σμένου εικονιδίου</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Πρόσθεση προσαρμοσμένου εικονιδίου</translation>
     </message>
@@ -1050,6 +1599,18 @@ Do you want to open it anyway?</source>
         <translation>Διαγραφή προσαρμοσμένου εικονιδίου</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Κατέβασμα favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Αδυναμία λήψης favicon.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Εικόνες</translation>
     </message>
@@ -1062,24 +1623,12 @@ Do you want to open it anyway?</source>
         <translation>Επιλογή εικόνας</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Κατέβασμα favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Αδυναμία λήψης favicon.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Αδυναμία ανάγνωσης εικονιδίου</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Χρήση προεπιλεγμένου εικονιδίου</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Χρήση προσαρμο&amp;σμένου εικονιδίου</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1089,14 +1638,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1121,10 +1662,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - Κλωνοποίηση</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Όνομα</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Πρόσθεση</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Αφαίρεση</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Άνοιγμα</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Αποθήκευση</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Επιβεβαίωση Αφαίρεσης</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1153,6 +1778,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Αναφ:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Όμαδα</translation>
     </message>
@@ -1168,11 +1798,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Αναφ:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1182,6 +1807,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1244,6 +1880,358 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Λάθος κλειδί ή βάση δεδομένων αρχείο είναι κατεστραμμένο.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Δεν είναι βάση δεδομένων KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1251,7 +2239,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Αποτυχία ανοίγματος βάσης δεδομένων.</translation>
+        <translation>Δεν είναι δυνατό να ανοίξει τη βάση δεδομένων.</translation>
     </message>
 </context>
 <context>
@@ -1262,7 +2250,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>Δεν ειναι βάση δεδομένων KeePass.</translation>
+        <translation>Δεν είναι βάση δεδομένων KeePass.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -1273,6 +2261,35 @@ Do you want to open it anyway?</source>
         <translation>Μη υποστηριζόμενη έκδοση βάσης δεδομένων KeePass.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Ρίζα</translation>
     </message>
@@ -1284,126 +2301,141 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Λάθος κλειδί ή βάση δεδομένων αρχείο είναι κατεστραμμένο.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Δεν είναι βάση δεδομένων KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Μη υποστηριζόμενη έκδοση βάσης δεδομένων KeePass.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Λάθος κλειδί ή το άρχειο της βάσης δεδομένων είναι κατεστραμένο.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <source>Incorrect group creation time field size</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Σε θέση να υπολογίσει το κύριο κλειδί</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Ανεπανόρθωτο σφάλμα κατά τον έλεγχο των κρυπτογραφικών λειτουργιών.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Σφάλμα</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Incorrect group level field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Μία άλλη διεργασία του KeePassXC ήδη τρέχει.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Άνοιγμα Βάσης Δεδομένων</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Ρυθμίσεις βάσης δεδομένων</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Αντιγραφή όνομα χρήστη στο πρόχειρο</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Αντιγραφή κωδικού στο πρόχειρο</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ρύθμίσεις</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Εμφάνιση γραμμής εργαλείων</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>Μόνο για ανάγνωση</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Εναλλαγή παραθύρων</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Βάση Δεδομένων KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Όλα τα αρχεία</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Αποθήκευση επιδιορθωμένη βάση δεδομένων</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Εγγραφή της βάσης δεδομένων απέτυχε.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Μία άλλη διεργασία του KeePassXC ήδη τρέχει.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Ανεπανόρθωτο σφάλμα κατά τον έλεγχο των κρυπτογραφικών λειτουργιών.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Σφάλμα</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Βάση Δεδομένων</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Πρόσφατες βάσεις δεδομένων</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Εισαγωγή</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Ε&amp;γγραφές</translation>
     </message>
@@ -1412,12 +2444,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Ομάδες</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Προβολή</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Εργαλεία</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1428,6 +2464,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Σχετικά με</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Αποθήκευση βάσης δεδομένων</translation>
     </message>
@@ -1468,24 +2508,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Διαγραφή ομάδας</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Sa&amp;ve database as...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Κλωνοποίηση καταχώρησης </translation>
+        <source>Change &amp;master key...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
+        <source>&amp;Database settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation type="unfinished"/>
+        <source>Database settings</source>
+        <translation>Ρυθμίσεις βάσης δεδομένων</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation type="unfinished"/>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Κλωνοποίηση καταχώρησης </translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1496,14 +2536,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Αντιγραφή &amp;ονόματος χρήστη</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Αντιγραφή όνομα χρήστη στο πρόχειρο</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Αντιγρα&amp;φή κωδικού </translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Αντιγραφή κωδικού στο πρόχειρο</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ρυθμίσεις</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Γεννήτρια Κωδικών</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation type="unfinished"/>
     </message>
@@ -1520,165 +2572,211 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Τίτλος</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Σημειώσεις</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Γεννήτρια Κωδικών</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Καθαρισμός ιστορικού</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Βάση Δεδομένων</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Εισαγωγή</translation>
+        <source>Import CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Εργαλεία</translation>
+        <source>Re&amp;pair database...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Άδειασμα κάδου ανακύκλωσης</translation>
+        <source>Show TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Καθαρισμός ιστορικού</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Σφάλματος πρόσβασης για αρχείο ρυθμίσεων %1</translation>
     </message>
     <message>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read-only</source>
+        <translation>Μόνο για ανάγνωση</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Ρύθμίσεις</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Εναλλαγή παραθύρων</translation>
+    </message>
+    <message>
         <source>Quit KeePassXC</source>
         <translation>Κλείσιμο KeePassXC</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Παρακαλώ αγγίξτε το κουμπί στο YubiKey σας!</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Βάση Δεδομένων KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <source>All files</source>
+        <translation>Όλα τα αρχεία</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation type="unfinished"/>
+        <source>Open database</source>
+        <translation>Άνοιγμα Βάσης Δεδομένων</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation type="unfinished"/>
+        <source>Save repaired database</source>
+        <translation>Αποθήκευση επιδιορθωμένη βάση δεδομένων</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation type="unfinished"/>
+        <source>Writing the database failed.</source>
+        <translation>Εγγραφή της βάσης δεδομένων απέτυχε.</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation type="unfinished"/>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Παρακαλώ αγγίξτε το κουμπί στο YubiKey σας!</translation>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>OptionDialog</name>
     <message>
-        <source>Dialog</source>
-        <translation>Διάλογος</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Για προχωρημένους</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Unknown cipher: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Θύρα:</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Προεπιλεγμένη θύρα: 19455</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>Το KeePassXC θα ακούει σε αυτή τη θύρα στο 127.0.0.1</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Unexpected EOF when writing public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF when writing private key</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Διάλογος</translation>
+    </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
         <translation>Αυτό είναι απαραίτητο για τη πρόσβαση στις βάσεις δεδομένων σας, από το ChromeIPass ή το PassIFox</translation>
@@ -1688,6 +2786,15 @@ Using default port 19455.</source>
         <translation>Ενεργοποίηση του εξυπηρετητή KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Γενικά</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"/>
     </message>
@@ -1696,6 +2803,10 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation type="unfinished"/>
     </message>
@@ -1704,26 +2815,107 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Γεννήτρια Κωδικών</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Για προχωρημένους</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP Θύρα:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Προεπιλεγμένη θύρα: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>Το KeePassXC θα ακούει σε αυτή τη θύρα στο 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Κωδικός:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>ισχύς</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>εντροπία</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Κωδικός</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Τύποι χαρακτήρων</translation>
     </message>
@@ -1744,38 +2936,50 @@ Change them only if you know what you are doing.</source>
         <translation>Ειδικοί χαρακτήρες</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Εξαίρεση χαρακτήρων που μοίαζουν</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Αποδοχή</translation>
+        <source>Pick characters from every group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>%p%</source>
-        <translation type="unfinished"/>
+        <source>&amp;Length:</source>
+        <translation>&amp;Μήκος:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>ισχύς</translation>
+        <source>Passphrase</source>
+        <translation>Φράση Κλειδί</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>εντροπία</translation>
+        <source>Wordlist:</source>
+        <translation>Λίστα Λέξεων:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Μήκος:</translation>
+        <source>Word Count:</source>
+        <translation>Αριθμός Λέξεων:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation type="unfinished"/>
+        <source>Word Separator:</source>
+        <translation>Διαχωριστικό Λέξεων:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Αντιγραφή</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Αποδοχή</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Κλείσιμο</translation>
     </message>
@@ -1793,51 +2997,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Φτωχή</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Αδύναμη</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Καλή</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Εξαιρετική</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Κωδικός</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Φράση Κλειδί</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Λίστα Λέξεων:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Αριθμός Λέξεων:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Διαχωριστικό Λέξεων:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Αντιγραφή</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Διαδρομή της βάσης δεδομένων.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Εξαγωγή και τύπωμα των περιεχομένων της βάσης δεδομένων.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Διαδρομή της βάσης δεδομένων προς εξαγωγή.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Όνομα εντολής προς εκτέλεση.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Προβολή καταχωρίσεων βάσης δεδομένων.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Συγχώνευση δύο βάσεων δεδομένων.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Όνομα καταχώρησης προς προβολή.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation type="unfinished"/>
@@ -1861,7 +3284,27 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1881,14 +3324,22 @@ Change them only if you know what you are doing.</source>
         <translation>Κωδικός</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Σημειώσεις</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Ενσωμάτωση Περιηγητή</translation>
     </message>
@@ -1904,6 +3355,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1942,8 +3397,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"/>
+        <source>Search...</source>
+        <translation>Αναζήτηση...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1954,8 +3409,8 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Αναζήτηση...</translation>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1965,89 +3420,89 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>KeePassXC: New key association request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Αντικατάσταση τρέχοντος κλειδιού;</translation>
     </message>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Ενημέρωση Καταχώρησης</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Do you want to update the information in %1 - %2?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Αφαίρεση αποθηκευμένων δικαιωμάτων...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Διακοπή</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Βάση δεδομένων κλειδωμένη!</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Κλειδιά αφαιρέθηκαν από τη βάση</translation>
     </message>
-    <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Αντικατάσταση τρέχοντος κλειδιού;</translation>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Δε βρεθήκαν κλειδιά</translation>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Ενημέρωση Καταχώρησης</translation>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Βάση δεδομένων κλειδωμένη!</translation>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Ρυθμισμένες μη διαθέσιμες!</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Κλειδιά αφαιρέθηκαν από τη βάση</translation>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Δε βρεθήκαν κλειδιά</translation>
+        <source>Removing stored permissions...</source>
+        <translation>Αφαίρεση αποθηκευμένων δικαιωμάτων...</translation>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ρυθμισμένες μη διαθέσιμες!</translation>
+        <source>Abort</source>
+        <translation>Διακοπή</translation>
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Δικαιώματα αφαιρέθηκαν</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Δε βρέθηκε καταχώρηση με δικαιώματα!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2071,10 +3526,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Βασικές Ρυθμίσεις</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Θυμηθείτε την τελευταία βάσεις δεδομένων</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Φόρτωμα προηγούμενων βάσεων δεδομένων κατά την εκκίνηση</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Αυτόματη αποθήκευση κατα την έξοδο</translation>
     </message>
@@ -2083,20 +3554,28 @@ give it a unique name to identify and accept it.</source>
         <translation>Αυτόματη Αποθήκευση μετά απο κάθε αλλαγή</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Αυτόματη επαναφόρτωση βάσης σε περίπτωση εξωτερικής τροποποίησης</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Ελαχιστοποίηση οταν αντιγράφετε στο πρόχειρο</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Ελαχιστοποίηση παραθύρου κατά την εκκίνηση</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Χρησιμοποίηση εικονιδίου ομάδας κατα την δημιουργία καταχώρησης</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Γλώσσα</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2107,39 +3586,27 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Φόρτωμα προηγούμενων βάσεων δεδομένων κατά την εκκίνηση</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Αυτόματη επαναφόρτωση βάσης σε περίπτωση εξωτερικής τροποποίησης</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Ελαχιστοποίηση παραθύρου κατά την εκκίνηση</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Βασικές Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Dark system tray icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation type="unfinished"/>
+        <source>Language</source>
+        <translation>Γλώσσα</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Αυτόματη-Γραφή</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2147,26 +3614,32 @@ give it a unique name to identify and accept it.</source>
         <translation>Πάντα ερώτηση για την εκτέλεση του Auto-Type</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Καθυστέρηση Auto-Type</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Εκκαθάριση πρόχειρου μετά από</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>δευτερόλεπτα</translation>
     </message>
     <message>
@@ -2174,8 +3647,12 @@ give it a unique name to identify and accept it.</source>
         <translation>Κλείδωμα βάσης δεδομένων μετα απο ανενεργεία </translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Εμφάνιση κωδίκων σε απλό κείμενο από προεπιλογή</translation>
+        <source>Convenience</source>
+        <translation>Ευκολία</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Κλείδωμα βάσεων δεδομένων κατά το κλείδωμα της συνεδρίας ή την αναδίπλωση της οθόνης</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2186,16 +3663,16 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Εμφάνιση κωδίκων σε απλό κείμενο από προεπιλογή</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Ευκολία</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Κλείδωμα βάσεων δεδομένων κατά το κλείδωμα της συνεδρίας ή την αναδίπλωση της οθόνης</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2217,6 +3694,14 @@ give it a unique name to identify and accept it.</source>
         <translation>Κλειδί:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Χρήση προσαρμοσμένων ρυθμίσεων</translation>
     </message>
@@ -2242,6 +3727,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>δευτερόλεπτα</translation>
     </message>
 </context>
@@ -2309,88 +3795,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>διαδρομή σε προσαρμοσμένο αρχείο ρυθμίσεων</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>Αρχείο κλειδί της βάσεως δεδομένων</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>read password of the database from stdin</source>
-        <translation>Διάβασμα κωδικού βάσης από το stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>ονόματα αρχείων των βάσεων δεδομένων κωδικών προς άνοιγμα (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Αντιγραφή ενός κωδικού στο πρόχειρο</translation>
-    </message>
-    <message>
         <source>Path of the database.</source>
         <translation>Διαδρομή της βάσης δεδομένων.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Χρήση ενός γραφικού παραθύρου διαλόγου για το ξεκλείδωμα της βάσης δεδομένων.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Όνομα καταχώρησης προς αντιγραφή.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Εξαγωγή και τύπωμα των περιεχομένων της βάσης δεδομένων.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Διαδρομή της βάσης δεδομένων προς εξαγωγή.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Όνομα εντολής προς εκτέλεση.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Προβολή καταχωρίσεων βάσης δεδομένων.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Εκτύπωση των UUID των καταχωρίσεων και των ομάδων.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Συγχώνευση δύο βάσεων δεδομένων.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation type="unfinished"/>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>ονόματα αρχείων των βάσεων δεδομένων κωδικών προς άνοιγμα (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation type="unfinished"/>
+        <source>path to a custom config file</source>
+        <translation>διαδρομή σε προσαρμοσμένο αρχείο ρυθμίσεων</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Χρήση το ίδιου κωδικού και για τις δύο βάσεις δεδομένων.</translation>
+        <source>key file of the database</source>
+        <translation>Αρχείο κλειδί της βάσεως δεδομένων</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Εμφάνιση ενός κωδικού.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>Διάβασμα κωδικού βάσης από το stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Όνομα καταχώρησης προς προβολή.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_en.ts b/share/translations/keepassx_en.ts
index 7cc9fc3c3..677273187 100644
--- a/share/translations/keepassx_en.ts
+++ b/share/translations/keepassx_en.ts
@@ -12,68 +12,72 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contributors</source>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Debug Info</source>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy to clipboard</source>
+        <source>Project Maintainers:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Version %1
-</source>
+        <source>Contributors</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Revision: %1</source>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Libraries:</source>
+        <source>Debug Info</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Operating system: %1
-CPU architecture: %2
-Kernel: %3 %4</source>
+        <source>Include the following information whenever you report a bug:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enabled extensions:</source>
+        <source>Copy to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <source>Version %1
+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <source>Revision: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Project Maintainers:</source>
+        <source>Distribution: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <source>Libraries:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Include the following information whenever you report a bug:</source>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Distribution: %1</source>
+        <source>Enabled extensions:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation type="unfinished"></translation>
     </message>
@@ -90,8 +94,11 @@ Kernel: %3 %4</source>
 Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>Enable SSH Agent (requires restart)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -105,6 +112,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -124,11 +151,292 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -147,6 +455,10 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation type="unfinished"></translation>
     </message>
@@ -155,6 +467,14 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation type="unfinished"></translation>
     </message>
@@ -175,6 +495,10 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -188,19 +512,14 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Empty password</source>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -215,15 +534,15 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Replace username and password with references</source>
+        <source>Append &apos; - Clone&apos; to title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy history</source>
+        <source>Replace username and password with references</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Append &apos; - Clone&apos; to title</source>
+        <source>Copy history</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -322,10 +641,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
@@ -336,17 +651,26 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -368,6 +692,14 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -376,23 +708,30 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All files</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Key files</source>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select key file</source>
+        <source>Don&apos;t show this warning again</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Refresh</source>
+        <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Challenge Response:</source>
+        <source>Key files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select key file</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -411,11 +750,11 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
+        <source>Unable to open the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
+        <source>Database opened fine. Nothing to do.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -435,39 +774,56 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
+        <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Database description:</source>
+        <source>Encryption</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default username:</source>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> MiB</source>
+        <source>Understood, keep number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Benchmark</source>
+        <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Max. history items:</source>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Max. history size:</source>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use recycle bin</source>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -479,91 +835,130 @@ You can now save it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Algorithm:</source>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> thread</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>DatabaseTabWidget</name>
+    <name>DatabaseSettingsWidgetGeneral</name>
     <message>
-        <source>Root</source>
+        <source>Database Meta Data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
+        <source>Database name:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All files</source>
+        <source>Database description:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open database</source>
+        <source>Default username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File not found!</source>
+        <source>History Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
+        <source>Max. history items:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
+        <source>Max. history size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All files (*)</source>
+        <source> MiB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Close?</source>
+        <source>Use recycle bin</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Save changes?</source>
+        <source>Root</source>
+        <comment>Root group</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
+        <source>KeePass 2 Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
+        <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save database as</source>
+        <source>Open database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New database</source>
+        <source>File not found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>locked</source>
+        <source>Unable to open the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock database</source>
+        <source>File opened in read only mode.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
+        <source>Open CSV file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
+        <source>CSV file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
+        <source>All files (*)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Close?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -572,60 +967,65 @@ Discard changes and close anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Export database to CSV file</source>
+        <source>Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>CSV file</source>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
+        <source>Writing the database failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
+        <source>Passwords</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Merge database</source>
+        <source>Save database as</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
+        <source>Export database to CSV file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passwords</source>
+        <source>Writing the CSV file failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Database already opened</source>
+        <source>New database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
+        <source>locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open read-only</source>
+        <source>Lock database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
+        <source>Can&apos;t lock the database as you are currently editing it.
+Please press cancel to finish your changes or discard them.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open CSV file</source>
+        <source>This database has been modified.
+Do you want to save the database before locking it?
+Otherwise your changes are lost.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation type="unfinished"></translation>
     </message>
@@ -646,6 +1046,14 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -657,27 +1065,27 @@ Do you want to open it anyway?</source>
         </translation>
     </message>
     <message>
-        <source>Delete group?</source>
+        <source>Execute command?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
+        <source>Remember my choice</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
+        <source>Delete group?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searching...</source>
+        <source>Unable to calculate master key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -697,43 +1105,115 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Execute command?</source>
+        <source>File has changed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <source>The database file has changed. Do you want to load the changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remember my choice</source>
+        <source>Merge Request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Autoreload Request</source>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Merge Request</source>
+        <source>Empty recycle bin?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
+        <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enabled</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -764,6 +1244,30 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation type="unfinished"></translation>
     </message>
@@ -784,20 +1288,19 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select file</source>
+        <source>Confirm Remove</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to open file</source>
+        <source>Are you sure you want to remove this attribute?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save attachment</source>
+        <source>[PROTECTED]</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
+        <source>Press reveal to view or edit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -822,152 +1325,208 @@ Do you want to open it anyway?</source>
         <source>1 year</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
-        <source>Confirm Remove</source>
+        <source>Add</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to remove this attribute?</source>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
+        <source>Protect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Are you sure you want to remove this attachment?</source>
+        <source>Reveal</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attachments</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EditEntryWidgetAdvanced</name>
+    <name>EditEntryWidgetAutoType</name>
     <message>
-        <source>Additional attributes</source>
+        <source>Enable Auto-Type for this entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add</source>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remove</source>
+        <source>&amp;Use custom Auto-Type sequence:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Attachments</source>
+        <source>Window Associations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save</source>
+        <source>+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open</source>
+        <source>-</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit Name</source>
+        <source>Window title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Protect</source>
+        <source>Use default se&amp;quence</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Reveal</source>
+        <source>Set custo&amp;m sequence:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EditEntryWidgetAutoType</name>
+    <name>EditEntryWidgetHistory</name>
     <message>
-        <source>Enable Auto-Type for this entry</source>
+        <source>Show</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>+</source>
+        <source>Restore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>-</source>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Window title:</source>
+        <source>Delete all</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
+        <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use default se&amp;quence</source>
+        <source>Repeat:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set custo&amp;m sequence:</source>
+        <source>Title:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Window Associations</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>EditEntryWidgetHistory</name>
     <message>
-        <source>Show</source>
+        <source>Presets</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restore</source>
+        <source>Toggle the checkbox to reveal the notes section.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete</source>
+        <source>Username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete all</source>
+        <source>Expires</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>EditEntryWidgetMain</name>
+    <name>EditEntryWidgetSSHAgent</name>
     <message>
-        <source>Title:</source>
+        <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Username:</source>
+        <source>Remove key from agent after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
+        <source> seconds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Repeat:</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL:</source>
+        <source>Remove key from agent when database is closed/locked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
+        <source>Public key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Presets</source>
+        <source>Add key to agent when database is opened/unlocked</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes:</source>
+        <source>Comment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1040,59 +1599,59 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
-        <source>Add custom icon</source>
+        <source>&amp;Use default icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Delete custom icon</source>
+        <source>Use custo&amp;m icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Images</source>
+        <source>Add custom icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All files</source>
+        <source>Delete custom icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Select Image</source>
+        <source>Download favicon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Download favicon</source>
+        <source>Unable to fetch favicon.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to fetch favicon.</source>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Can&apos;t read icon</source>
+        <source>Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
+        <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use custo&amp;m icon</source>
+        <source>Select Image</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm Delete</source>
+        <source>Can&apos;t read icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <source>Custom icon already exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <source>Confirm Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Custom icon already exists</source>
+        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1119,6 +1678,93 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1151,6 +1797,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1166,16 +1817,22 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Group</name>
     <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
+        <source>Recycle Bin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Group</name>
+    <name>HostInstaller</name>
     <message>
-        <source>Recycle Bin</source>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1242,36 +1899,163 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
-    <name>KeePass1OpenWidget</name>
+    <name>Kdbx3Reader</name>
     <message>
-        <source>Import KeePass1 database</source>
+        <source>Unable to calculate master key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KeePass1Reader</name>
+    <name>Kdbx3Writer</name>
     <message>
-        <source>Unable to read keyfile.</source>
+        <source>Unable to issue challenge-response.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Not a KeePass database.</source>
+        <source>Unable to calculate master key</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
     <message>
-        <source>Unsupported encryption algorithm.</source>
+        <source>missing database headers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
+        <source>Unable to calculate master key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Root</source>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1279,30 +2063,55 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>KeePass2Reader</name>
+    <name>KdbxReader</name>
     <message>
-        <source>Not a KeePass database.</source>
+        <source>Invalid cipher uuid length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
+        <source>Unsupported cipher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
+        <source>Invalid compression flags length</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
+        <source>Unsupported compression algorithm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1312,89 +2121,325 @@ You can import it by clicking on Database &gt; &apos;Import KeePass 1 database..
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
-    <name>KeePass2Writer</name>
+    <name>KdbxXmlReader</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>XML parsing failure: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
+        <source>No root group</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Missing icon uuid or data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
+        <source>Missing custom data key or value</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Multiple group elements</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Null group uuid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>MainWindow</name>
+    <name>KeePass1OpenWidget</name>
     <message>
-        <source>Open database</source>
+        <source>Import KeePass1 database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Database settings</source>
+        <source>Unable to open the database.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
     <message>
-        <source>Copy username to clipboard</source>
+        <source>Unable to read keyfile.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
+        <source>Not a KeePass database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Settings</source>
+        <source>Unsupported encryption algorithm.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show toolbar</source>
+        <source>Unsupported KeePass database version.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>read-only</source>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>Invalid number of groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
+        <source>Invalid number of entries</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All files</source>
+        <source>Invalid content hash size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Save repaired database</source>
+        <source>Invalid transform seed size</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1402,6 +2447,14 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1410,11 +2463,15 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;View</source>
+        <source>&amp;Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1426,6 +2483,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1466,23 +2527,23 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Sa&amp;ve database as...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>Change &amp;master key...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
+        <source>&amp;Database settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Database settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>&amp;Clone entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1494,14 +2555,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1518,35 +2591,59 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password Generator</source>
+        <source>Copy notes to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Clear history</source>
+        <source>&amp;Export to CSV file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Database</source>
+        <source>Import KeePass 1 database...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import</source>
+        <source>Import CSV file...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
+        <source>Re&amp;pair database...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Clear history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1554,127 +2651,149 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>read-only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
+        <source>Toggle window</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
+        <source>Quit KeePassXC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>KeePass 2 Database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>All files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>Open database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>Save repaired database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>Writing the database failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Please touch the button on your YubiKey!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>General</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>HTTP Port:</source>
+        <source>No private key payload to decrypt</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
+        <source>Unknown cipher: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Unknown KDF: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unknown key type: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1686,6 +2805,15 @@ Using default port 19455.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>General</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1694,6 +2822,10 @@ Using default port 19455.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1702,26 +2834,107 @@ Using default port 19455.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1742,31 +2955,35 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Accept</source>
+        <source>Pick characters from every group</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%p%</source>
+        <source>&amp;Length:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>strength</source>
+        <source>Passphrase</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>entropy</source>
+        <source>Wordlist:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
+        <source>Word Count:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
+        <source>Word Separator:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1774,6 +2991,14 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1791,51 +3016,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
+        <source>Database not opened</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Wordlist:</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Word Count:</source>
+        <source>Timeout or cannot connect to KeePassXC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Word Separator:</source>
+        <source>Action cancelled or denied</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Copy</source>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation type="unfinished"></translation>
@@ -1858,7 +3302,27 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1878,11 +3342,19 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>URL</source>
+        <source>Notes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Notes</source>
+        <source>Last Modified</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1901,6 +3373,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1939,7 +3415,7 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
+        <source>Search...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1951,7 +3427,7 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search...</source>
+        <source>Case Sensitive</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1962,87 +3438,93 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>KeePassXC: New key association request</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
+        <source>KeePassXC: Overwrite existing key?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <source>KeePassXC: Update Entry</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Do you want to update the information in %1 - %2?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>KeePassXC: Database locked!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Abort</source>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Successfully removed permissions from %1 %2.</source>
+        <source>KeePassXC: Removed keys from database</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
+        <source>KeePassXC: No keys found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
+        <source>KeePassXC: Settings not available!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>Removing stored permissions...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>Abort</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
+        <source>KeePassXC: Removed permissions</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
+        <source>KeePassXC: No entry with permissions found!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
+        <source>The active database does not contain an entry with permissions.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2068,67 +3550,75 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically save on exit</source>
+        <source>Remember last key files and security dongles</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically save after every change</source>
+        <source>Load previous databases on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
+        <source>Automatically save on exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
+        <source>Automatically save after every change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Automatically reload the database when modified externally</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Language</source>
+        <source>Minimize when copying to clipboard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
+        <source>Minimize window at application startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
+        <source>Use group icon on entry creation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
+        <source>Hide the Details view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Hide window to system tray instead of app exit</source>
+        <source>Show a system tray icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Hide window to system tray when minimized</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Basic Settings</source>
+        <source>Hide window to system tray instead of app exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Dark system tray icon</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2136,7 +3626,11 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2144,26 +3638,32 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>Global Auto-Type shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> ms</source>
+        <source>Auto-Type delay</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2171,7 +3671,11 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
+        <source>Convenience</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2183,15 +3687,15 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Timeouts</source>
+        <source>Show passwords in cleartext by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Hide passwords in the preview panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Hide entry notes by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2214,6 +3718,14 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2239,6 +3751,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -2306,27 +3819,7 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2334,59 +3827,31 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
+        <source>KeePassXC - cross-platform password manager</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
+        <source>path to a custom config file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
+        <source>key file of the database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show a password.</source>
+        <source>read password of the database from stdin</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
diff --git a/share/translations/keepassx_en_US.ts b/share/translations/keepassx_en_US.ts
new file mode 100644
index 000000000..518390f5d
--- /dev/null
+++ b/share/translations/keepassx_en_US.ts
@@ -0,0 +1,3872 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_US" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation>About KeePassXC</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>About</translation>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Project Maintainers:</translation>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation>Contributors</translation>
+    </message>
+    <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation>Debug Info</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Include the following information whenever you report a bug:</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copy to clipboard</translation>
+    </message>
+    <message>
+        <source>Version %1
+</source>
+        <translation>Version %1
+</translation>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation>Revision: %1</translation>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation>Distribution: %1</translation>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation>Libraries:</translation>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</translation>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation>Enabled extensions:</translation>
+    </message>
+</context>
+<context>
+    <name>AccessControlDialog</name>
+    <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Confirm Access</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Remember this decision</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Allow</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Deny</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</translation>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Enable SSH Agent (requires restart)</translation>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation>Couldn&apos;t find an entry that matches the window title:</translation>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Type - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>The Syntax of your Auto-Type statement is incorrect!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>This Auto-Type command contains a very long delay. Do you really want to proceed?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>This Auto-Type command contains very slow key presses. Do you really want to proceed?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation>Window</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequence</translation>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation>Default sequence</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Type - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation>Select entry to Auto-Type:</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser Confirm Access</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Remember this decision</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Allow</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Deny</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>This is required for accessing your databases with KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Enable KeepassXC browser integration</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Enable integration for these browsers:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Show a &amp;notification when credentials are requested</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Re&amp;quest to unlock the database if it is locked</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Only entries with the same scheme (http://, https://, ...) are returned.</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>&amp;Match URL scheme (e.g., https://...)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Only returns the best matches for a specific URL instead of all entries for the whole domain.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>&amp;Return only best-matching credentials</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Sort &amp;matching credentials by title</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Sort matching credentials by &amp;username</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Disconnect all browsers</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>Forget all remembered &amp;permissions</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Advanced</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Never &amp;ask before accessing credentials</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Never ask before &amp;updating credentials</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Only the selected database has to be connected with a client.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Searc&amp;h in all opened databases for matching credentials</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatically creating or updating string fields is not supported.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Return advanced string fields which start with &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</translation>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation>Update &amp;native messaging manifest files at startup</translation>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>Support a proxy application between KeePassXC and browser extension.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation>Use a &amp;proxy application between KeePassXC and browser extension</translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation>Use a custom proxy location if you installed a proxy manually.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Use a &amp;custom proxy location</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Browse...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Executable Files (*.exe);;All Files (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>Executable Files (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Select custom proxy location</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: New key association request</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</translation>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Save and allow access</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Overwrite existing key?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Update Entry</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Do you want to update the information in %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Database locked!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Settings not available!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation>The active database does not contain a settings entry.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No keys found</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation>No shared encryption keys found in KeePassXC Settings.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Removed keys from database</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Successfully removed %n encryption key from KeePassXC settings.</numerusform><numerusform>Successfully removed %n encryption keys from KeePassXC settings.</numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Removing stored permissions…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abort</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Removed permissions</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Successfully removed permissions from %n entry.</numerusform><numerusform>Successfully removed permissions from %n entries.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No entry with permissions found!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>The active database does not contain an entry with permissions.</translation>
+    </message>
+</context>
+<context>
+    <name>ChangeMasterKeyWidget</name>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Enter password:</source>
+        <translation>Enter password:</translation>
+    </message>
+    <message>
+        <source>Repeat password:</source>
+        <translation>Repeat password:</translation>
+    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Key file</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>Browse</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation>Create</translation>
+    </message>
+    <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Cha&amp;llenge Response</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Refresh</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Key files</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>Create Key File...</translation>
+    </message>
+    <message>
+        <source>Unable to create Key File : </source>
+        <translation>Unable to create Key File : </translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>Select a key file</translation>
+    </message>
+    <message>
+        <source>Empty password</source>
+        <translation>Empty password</translation>
+    </message>
+    <message>
+        <source>Do you really want to use an empty string as password?</source>
+        <translation>Do you really want to use an empty string as password?</translation>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>Different passwords supplied.</translation>
+    </message>
+    <message>
+        <source>Failed to set %1 as the Key file:
+%2</source>
+        <translation>Failed to set %1 as the Key file:
+%2</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Legacy key file format</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</translation>
+    </message>
+    <message>
+        <source>Changing master key failed: no YubiKey inserted.</source>
+        <translation>Changing master key failed: no YubiKey inserted.</translation>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation>Clone Options</translation>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Append &apos; - Clone&apos; to title</translation>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation>Replace username and password with references</translation>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation>Copy history</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation>Import CSV fields</translation>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation>filename</translation>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation>size, rows, columns</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>Encoding</translation>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation>Codec</translation>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation>Text is qualified by</translation>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation>Fields are separated by</translation>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation>Comments start with</translation>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation>First record has field names</translation>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation>Number of headers line to discard</translation>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation>Consider &apos;\&apos; an escape character</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>Preview</translation>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation>Column layout</translation>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation>Not present in CSV file</translation>
+    </message>
+    <message>
+        <source>Empty fieldname </source>
+        <translation>Empty fieldname </translation>
+    </message>
+    <message>
+        <source>column </source>
+        <translation>column </translation>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation>Imported from CSV file</translation>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation>Original data: </translation>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file !</source>
+        <translation>Error(s) detected in CSV file !</translation>
+    </message>
+    <message>
+        <source> more messages skipped]</source>
+        <translation> more messages skipped]</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+</source>
+        <translation>CSV import: writer has errors:
+</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWizard</name>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n byte, </numerusform><numerusform>%n bytes, </numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n row, </numerusform><numerusform>%n rows, </numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n column</numerusform><numerusform>%n columns</numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation>Enter master key</translation>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation>Key File:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>Browse</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Refresh</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Challenge Response:</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Unable to open the database.</translation>
+    </message>
+    <message>
+        <source>Can&apos;t open key file</source>
+        <translation>Can&apos;t open key file</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Legacy key file format</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Don&apos;t show this warning again</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>Key files</translation>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation>Select key file</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseRepairWidget</name>
+    <message>
+        <source>Repair database</source>
+        <translation>Repair database</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>Can&apos;t open key file</source>
+        <translation>Can&apos;t open key file</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Unable to open the database.</translation>
+    </message>
+    <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Database opened fine. Nothing to do.</translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation>Success</translation>
+    </message>
+    <message>
+        <source>The database has been successfully repaired
+You can now save it.</source>
+        <translation>The database has been successfully repaired
+You can now save it.</translation>
+    </message>
+    <message>
+        <source>Unable to repair the database.</source>
+        <translation>Unable to repair the database.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidget</name>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation>Encryption</translation>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Number of rounds too high</translation>
+    </message>
+    <message>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</translation>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation>Understood, keep number</translation>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Cancel</translation>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Number of rounds too low</translation>
+    </message>
+    <message>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</translation>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation>KDF unchanged</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Failed to transform key with new KDF parameters; KDF unchanged.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Encryption Algorithm:</translation>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256 Bit   (default)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 Bit</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation>Key Derivation Function:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Transform rounds:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Benchmark 1-second delay</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Memory Usage:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Parallelism:</translation>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation> thread</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Database Meta Data</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Database name:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Database description:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Default username:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>History Settings</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Max. history items:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Max. history size:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Use recycle bin</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Open database</translation>
+    </message>
+    <message>
+        <source>File not found!</source>
+        <translation>File not found!</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Unable to open the database.</translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation>File opened in read only mode.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Open CSV file</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV file</translation>
+    </message>
+    <message>
+        <source>All files (*)</source>
+        <translation>All files (*)</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Merge database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Open KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 database</translation>
+    </message>
+    <message>
+        <source>Close?</source>
+        <translation>Close?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</translation>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation>Save changes?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; was modified.
+Save changes?</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>Writing the database failed.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Passwords</translation>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation>Save database as</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>Export database to CSV file</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Writing the CSV file failed.</translation>
+    </message>
+    <message>
+        <source>New database</source>
+        <translation>New database</translation>
+    </message>
+    <message>
+        <source>locked</source>
+        <translation>locked</translation>
+    </message>
+    <message>
+        <source>Lock database</source>
+        <translation>Lock database</translation>
+    </message>
+    <message>
+        <source>Can't lock the database as you are currently editing it.
+Please press cancel to finish your changes or discard them.</source>
+        <translation>Can&apos;t lock the database as you are currently editing it.
+Please press cancel to finish your changes or discard them.</translation>
+    </message>
+    <message>
+        <source>This database has been modified.
+Do you want to save the database before locking it?
+Otherwise your changes are lost.</source>
+        <translation>This database has been modified.
+Do you want to save the database before locking it?
+Otherwise your changes are lost.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation>Searching...</translation>
+    </message>
+    <message>
+        <source>Change master key</source>
+        <translation>Change master key</translation>
+    </message>
+    <message>
+        <source>Delete entry?</source>
+        <translation>Delete entry?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation>Do you really want to delete the entry &quot;%1&quot; for good?</translation>
+    </message>
+    <message>
+        <source>Delete entries?</source>
+        <translation>Delete entries?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete %1 entries for good?</source>
+        <translation>Do you really want to delete %1 entries for good?</translation>
+    </message>
+    <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Move entry to recycle bin?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Do you really want to move entry &quot;%1&quot; to the recycle bin?</translation>
+    </message>
+    <message>
+        <source>Move entries to recycle bin?</source>
+        <translation>Move entries to recycle bin?</translation>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation><numerusform>Do you really want to move %n entry to the recycle bin?</numerusform><numerusform>Do you really want to move %n entries to the recycle bin?</numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation>Execute command?</translation>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation>Remember my choice</translation>
+    </message>
+    <message>
+        <source>Delete group?</source>
+        <translation>Delete group?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Do you really want to delete the group &quot;%1&quot; for good?</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation>No current database.</translation>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation>No source database, nothing to do.</translation>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation>Search Results (%1)</translation>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation>No Results</translation>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation>File has changed</translation>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation>The database file has changed. Do you want to load the changes?</translation>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation>Merge Request</translation>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</translation>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <translation>Could not open the new database file while attempting to autoreload this database.</translation>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation>Empty recycle bin?</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation>Are you sure you want to permanently delete everything from your recycle bin?</translation>
+    </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Generate TOTP Token</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Close</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expiration</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Searching</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Attributes</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Attachments</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Window</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequence</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Search</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Clear</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Never</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTECTED]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Disabled</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Enabled</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation>Entry</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Advanced</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Properties</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>History</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(encrypted)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Select private key</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>File too large to be a private key</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Failed to open private key</translation>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation>Entry history</translation>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation>Add entry</translation>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation>Edit entry</translation>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>Different passwords supplied.</translation>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation>New attribute</translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirm Remove</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Are you sure you want to remove this attribute?</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTECTED]</translation>
+    </message>
+    <message>
+        <source>Press reveal to view or edit</source>
+        <translation>Press reveal to view or edit</translation>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation>Tomorrow</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation><numerusform>%n week</numerusform><numerusform>%n weeks</numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation><numerusform>%n month</numerusform><numerusform>%n months</numerusform></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation>1 year</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation>Additional attributes</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Add</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation>Edit Name</translation>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation>Protect</translation>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation>Reveal</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Attachments</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation>Enable Auto-Type for this entry</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Inherit default Auto-Type sequence from the &amp;group</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Use custom Auto-Type sequence:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Window Associations</translation>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>Window title:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation>Use default se&amp;quence</translation>
+    </message>
+    <message>
+        <source>Set custo&amp;m sequence:</source>
+        <translation>Set custo&amp;m sequence:</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation>Show</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation>Restore</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>Delete</translation>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation>Delete all</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>Repeat:</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>Title:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation>Presets</translation>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>Toggle the checkbox to reveal the notes section.</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Username:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expires</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Remove key from agent after</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation> seconds</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Fingerprint</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>Remove key from agent when database is closed/locked</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Public key</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Add key to agent when database is opened/unlocked</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comment</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Decrypt</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copy to clipboard</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Private key</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>External file</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Browse...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Attachment</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Add to agent</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Remove from agent</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Require user confirmation when this key is used</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation>Group</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>Icon</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>Properties</translation>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation>Add group</translation>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation>Edit group</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>Enable</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>Disable</translation>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation>Inherit from parent group (%1)</translation>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expires</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Search</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation>&amp;Use default Auto-Type sequence of parent group</translation>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation>Set default Auto-Type se&amp;quence</translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Use default icon</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Use custo&amp;m icon</translation>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation>Add custom icon</translation>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation>Delete custom icon</translation>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation>Download favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Unable to fetch favicon.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</translation>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation>Images</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Select Image</source>
+        <translation>Select Image</translation>
+    </message>
+    <message>
+        <source>Can&apos;t read icon</source>
+        <translation>Can&apos;t read icon</translation>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation>Custom icon already exists</translation>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation>Confirm Delete</translation>
+    </message>
+    <message>
+        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <translation>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</translation>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation>Created:</translation>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation>Modified:</translation>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation>Accessed:</translation>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation>UUID:</translation>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
+        <translation> - Clone</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Size</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Add</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remove</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Open</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Save</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Select files</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>Are you sure you want to remove %n attachment?</numerusform><numerusform>Are you sure you want to remove %n attachments?</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirm Remove</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Save attachments</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Unable to create directory:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Confirm overwrite</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Unable to save attachments:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Unable to open attachment:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Unable to open attachments:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>Unable to open files:
+%1</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation>Last modified</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Title</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref: </translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Group</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Title</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation>Recycle Bin</translation>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Cannot save file!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Cannot save the native messaging script file.</translation>
+    </message>
+</context>
+<context>
+    <name>HttpPasswordGeneratorWidget</name>
+    <message>
+        <source>Length:</source>
+        <translation>Length:</translation>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation>Character Types</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation>Upper Case Letters</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>Lower Case Letters</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>Numbers</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>Special Characters</translation>
+    </message>
+    <message>
+        <source>/*_&amp; ...</source>
+        <translation>/*_&amp; ...</translation>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation>Exclude look-alike characters</translation>
+    </message>
+    <message>
+        <source>Ensure that the password contains characters from every group</source>
+        <translation>Ensure that the password contains characters from every group</translation>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation>&amp;Close</translation>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation>Close message</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Unable to issue challenge-response.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Wrong key or database file is corrupt.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Unable to issue challenge-response.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>missing database headers</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Invalid header checksum size</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Header SHA256 mismatch</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Wrong key or database file is corrupt. (HMAC mismatch)</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Unknown cipher</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Invalid header id size</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Invalid header field length</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Invalid header data length</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation>Failed to open buffer for KDF parameters in header</translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation>Unsupported key derivation function (KDF) or invalid parameters</translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation>Legacy header fields found in KDBX4 file.</translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>Invalid inner header id size</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation>Invalid inner header field length</translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation>Invalid inner header binary size</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Unsupported KeePass variant map version.</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map entry name length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map entry name data</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map entry value length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map entry value data</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map Bool entry value length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map Int32 entry value length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map UInt32 entry value length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map Int64 entry value length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map UInt64 entry value length</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map entry type</translation>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Invalid variant map field type size</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation>Invalid symmetric cipher algorithm.</translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Invalid symmetric cipher IV size.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>Failed to serialize KDF parameters variant map</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation>Invalid cipher UUID length</translation>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation>Unsupported cipher</translation>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>Invalid compression flags length</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Unsupported compression algorithm</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation>Invalid master seed size</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Invalid transform seed size</translation>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation>Invalid transform rounds size</translation>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation>Invalid start bytes size</translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation>Invalid random stream id size</translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation>Invalid inner random stream cipher</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Not a KeePass database.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; &apos;Import KeePass 1 database...&apos;.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>Unsupported KeePass 2 database version.</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>XML parsing failure: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>No root group</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation>Missing icon UUID or data</translation>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation>Missing custom data key or value</translation>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation>Multiple group elements</translation>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation>Null group UUID</translation>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation>Invalid group icon number</translation>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>Invalid EnableAutoType value</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation>Invalid EnableSearching value</translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>No group UUID found</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation>Null DeleteObject UUID</translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation>Missing DeletedObject UUID or time</translation>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation>Null entry UUID</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation>Invalid entry icon number</translation>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation>History element in history entry</translation>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation>No entry UUID found</translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation>History element with different UUID</translation>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation>Unable to decrypt entry string</translation>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation>Duplicate custom attribute found</translation>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation>Entry string key or value missing</translation>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation>Duplicate attachment found</translation>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation>Entry binary key or value missing</translation>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation>Auto-Type association window or sequence missing</translation>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>Invalid bool value</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>Invalid date time value</translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Invalid color value</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation>Invalid color rgb part</translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>Invalid number value</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>Invalid UUID value</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation>Unable to decompress binary</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation>Import KeePass1 database</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Unable to open the database.</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation>Unable to read keyfile.</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Not a KeePass database.</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation>Unsupported encryption algorithm.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation>Unsupported KeePass database version.</translation>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Unable to read encryption IV</translation>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>Invalid number of groups</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation>Invalid number of entries</translation>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation>Invalid content hash size</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Invalid transform seed size</translation>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation>Invalid number of transform rounds</translation>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation>Unable to construct group tree</translation>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation>Root</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Unable to calculate master key</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Wrong key or database file is corrupt.</translation>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation>Key transformation failed</translation>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation>Invalid group field type number</translation>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation>Invalid group field size</translation>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation>Read group field data doesn&apos;t match size</translation>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation>Incorrect group id field size</translation>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation>Incorrect group creation time field size</translation>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation>Incorrect group modification time field size</translation>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation>Incorrect group access time field size</translation>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation>Incorrect group expiry time field size</translation>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation>Incorrect group icon field size</translation>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation>Incorrect group level field size</translation>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation>Invalid group field type</translation>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation>Missing group id or level</translation>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation>Missing entry field type number</translation>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation>Invalid entry field size</translation>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation>Read entry field data doesn&apos;t match size</translation>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation>Invalid entry uuid field size</translation>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation>Invalid entry group id field size</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation>Invalid entry icon field size</translation>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation>Invalid entry creation time field size</translation>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation>Invalid entry modification time field size</translation>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation>Invalid entry expiry time field size</translation>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation>Invalid entry field type</translation>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Existing single-instance lock file is invalid. Launching new instance.</translation>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>The lock file could not be created. Single-instance mode disabled.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Another instance of KeePassXC is already running.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatal error while testing the cryptographic functions.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Database</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation>&amp;Recent databases</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Import</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Help</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation>E&amp;ntries</translation>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute to clipboard</source>
+        <translation>Copy att&amp;ribute to clipboard</translation>
+    </message>
+    <message>
+        <source>Time-based one-time password</source>
+        <translation>Time-based one-time password</translation>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation>&amp;Groups</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>&amp;Tools</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Quit</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;About</translation>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Open database...</translation>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation>&amp;Save database</translation>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation>&amp;Close database</translation>
+    </message>
+    <message>
+        <source>&amp;New database</source>
+        <translation>&amp;New database</translation>
+    </message>
+    <message>
+        <source>Merge from KeePassX database</source>
+        <translation>Merge from KeePassX database</translation>
+    </message>
+    <message>
+        <source>&amp;Add new entry</source>
+        <translation>&amp;Add new entry</translation>
+    </message>
+    <message>
+        <source>&amp;View/Edit entry</source>
+        <translation>&amp;View/Edit entry</translation>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation>&amp;Delete entry</translation>
+    </message>
+    <message>
+        <source>&amp;Add new group</source>
+        <translation>&amp;Add new group</translation>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation>&amp;Edit group</translation>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>&amp;Delete group</translation>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Sa&amp;ve database as...</translation>
+    </message>
+    <message>
+        <source>Change &amp;master key...</source>
+        <translation>Change &amp;master key...</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Database settings</translation>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation>Database settings</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clone entry</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>&amp;Find</translation>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation>Copy &amp;username</translation>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copy username to clipboard</translation>
+    </message>
+    <message>
+        <source>Cop&amp;y password</source>
+        <translation>Cop&amp;y password</translation>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copy password to clipboard</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Settings</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>Password Generator</translation>
+    </message>
+    <message>
+        <source>&amp;Perform Auto-Type</source>
+        <translation>&amp;Perform Auto-Type</translation>
+    </message>
+    <message>
+        <source>&amp;Open URL</source>
+        <translation>&amp;Open URL</translation>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation>&amp;Lock databases</translation>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation>&amp;Title</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation>Copy title to clipboard</translation>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation>&amp;URL</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Copy URL to clipboard</translation>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation>&amp;Notes</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation>Copy notes to clipboard</translation>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Export to CSV file...</translation>
+    </message>
+    <message>
+        <source>Import KeePass 1 database...</source>
+        <translation>Import KeePass 1 database...</translation>
+    </message>
+    <message>
+        <source>Import CSV file...</source>
+        <translation>Import CSV file...</translation>
+    </message>
+    <message>
+        <source>Re&amp;pair database...</source>
+        <translation>Re&amp;pair database...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Show TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Set up TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copy &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>E&amp;mpty recycle bin</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Clear history</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Access error for config file %1</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>read-only</source>
+        <translation>read-only</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Settings</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Toggle window</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Quit KeePassXC</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Database</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>All files</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Open database</translation>
+    </message>
+    <message>
+        <source>Save repaired database</source>
+        <translation>Save repaired database</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>Writing the database failed.</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Please touch the button on your YubiKey!</translation>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Invalid key file, expecting an OpenSSH key</translation>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation>PEM boundary mismatch</translation>
+    </message>
+    <message>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation>This is not an OpenSSH key, only modern keys are supported</translation>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation>Base64 decoding failed</translation>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation>Key file way too small.</translation>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation>Key file magic header id invalid</translation>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation>Found zero keys</translation>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation>Failed to read public key.</translation>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Corrupted key file, reading private key failed</translation>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation>No private key payload to decrypt</translation>
+    </message>
+    <message>
+        <source>Unknown cipher: </source>
+        <translation>Unknown cipher: </translation>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation>Trying to run KDF without cipher</translation>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>Passphrase is required to decrypt this key</translation>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>Key derivation failed, key file corrupted?</translation>
+    </message>
+    <message>
+        <source>Unknown KDF: </source>
+        <translation>Unknown KDF: </translation>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>Decryption failed, wrong passphrase?</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>Unexpected EOF while reading public key</translation>
+    </message>
+    <message>
+        <source>Unknown key type: </source>
+        <translation>Unknown key type: </translation>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>Unexpected EOF while reading private key</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Can&apos;t write public key as it is empty</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>Unexpected EOF when writing public key</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Can&apos;t write private key as it is empty</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Unexpected EOF when writing private key</translation>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <translation>This is required for accessing your databases from ChromeIPass or PassIFox</translation>
+    </message>
+    <message>
+        <source>Enable KeePassHTTP server</source>
+        <translation>Enable KeePassHTTP server</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Sh&amp;ow a notification when credentials are requested</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Only returns the best matches for a specific URL instead of all entries for the whole domain.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best matching entries</source>
+        <translation>&amp;Return only best matching entries</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Re&amp;quest to unlock the database if it is locked</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <translation>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL schemes</source>
+        <translation>&amp;Match URL schemes</translation>
+    </message>
+    <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Sort matching entries by &amp;username</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Sort &amp;matching entries by title</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>R&amp;emove all shared encryption keys from active database</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Re&amp;move all stored permissions from entries in active database</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>Password Generator</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Advanced</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Always allow &amp;access to entries</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Always allow &amp;updating entries</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Only the selected database has to be connected with a client.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Searc&amp;h in all opened databases for matching entries</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatically creating or updating string fields is not supported.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Return advanced string fields which start with &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP Port:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Default port: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC will listen to this port on 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Cannot bind to privileged ports</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Cannot bind to privileged ports below 1024!
+Using default port 19455.</translation>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Password:</translation>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>strength</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropy</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation>Character Types</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation>Upper Case Letters</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>Lower Case Letters</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>Numbers</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>Special Characters</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>Extended ASCII</translation>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation>Exclude look-alike characters</translation>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation>Pick characters from every group</translation>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation>&amp;Length:</translation>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation>Passphrase</translation>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation>Wordlist:</translation>
+    </message>
+    <message>
+        <source>Word Count:</source>
+        <translation>Word Count:</translation>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation>Word Separator:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>Generate</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copy</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Accept</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Close</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>Apply</translation>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation>Entropy: %1 bit</translation>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation>Password Quality: %1</translation>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation>Poor</translation>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation>Weak</translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation>Good</translation>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation>Excellent</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation>Database not opened</translation>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation>Database hash not available</translation>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation>Client public key not received</translation>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation>Cannot decrypt message</translation>
+    </message>
+    <message>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation>Timeout or cannot connect to KeePassXC</translation>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation>Action cancelled or denied</translation>
+    </message>
+    <message>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</translation>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation>KeePassXC association failed, try again</translation>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation>Key change was not successful</translation>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>Encryption key is not recognized</translation>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation>No saved databases found</translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation>Incorrect action</translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation>Empty message received</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>No URL provided</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>No logins found</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Unknown error</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation>Add a new entry to a database.</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Path of the database.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>Key file of the database.</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>path</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>Username for the entry.</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>username</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL for the entry.</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation>Prompt for the entry&apos;s password.</translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation>Generate a password for the entry.</translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation>Length for the generated password.</translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>length</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>Path of the entry to add.</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation>Copy an entry&apos;s password to the clipboard.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>Path of the entry to clip.</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>Timeout in seconds before clearing the clipboard.</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Edit an entry.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Title for the entry.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>title</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation>Path of the entry to edit.</translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation>Estimate the entropy of a password.</translation>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation>Password for which to estimate the entropy.</translation>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation>Perform advanced analysis on the password.</translation>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Extract and print the content of a database.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Path of the database to extract.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation>Insert password to unlock %1: </translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation>Failed to load key file %1 : %2</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</translation>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation>
+
+Available commands:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Name of the command to execute.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>List database entries.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Path of the group to list. Default is /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation>Find entries quickly.</translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation>Search term.</translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Merge two databases.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Path of the database to merge into.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Path of the database to merge from.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Use the same credentials for both database files.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>Key file of the database to merge from.</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation>Show an entry&apos;s information.</translation>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</translation>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>attribute</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Name of the entry to show.</translation>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation>NULL device</translation>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation>error reading from device</translation>
+    </message>
+    <message>
+        <source>file empty !
+</source>
+        <translation>file empty !
+</translation>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation>malformed string</translation>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation>missing closing quote</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – recommended)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>Group</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>Title</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Username</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation>Last Modified</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Created</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation>Legacy Browser Integration</translation>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Browser Integration</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation>YubiKey[%1] Challenge Response - Slot %2 - %3</translation>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation>Press</translation>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation>Passive</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</translation>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation>Internal zlib error when compressing: </translation>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation>Error writing to underlying device: </translation>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation>Error opening underlying device: </translation>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation>Error reading data from underlying device: </translation>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation>Internal zlib error when decompressing: </translation>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation>The gzip format not supported in this version of zlib.</translation>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation>Internal zlib error: </translation>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search...</source>
+        <translation>Search...</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Search</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Clear</translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation>Case Sensitive</translation>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation>Limit search to selected group</translation>
+    </message>
+</context>
+<context>
+    <name>Service</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: New key association request</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
+        <translation>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Overwrite existing key?</translation>
+    </message>
+    <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Update Entry</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Do you want to update the information in %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Database locked!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Removed keys from database</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation><numerusform>Successfully removed %n encryption key from KeePassXC/HTTP Settings.</numerusform><numerusform>Successfully removed %n encryption keys from KeePassXC/HTTP Settings.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No keys found</translation>
+    </message>
+    <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>No shared encryption-keys found in KeePassHttp Settings.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Settings not available!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>The active database does not contain an entry of KeePassHttp Settings.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Removing stored permissions...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abort</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Removed permissions</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation><numerusform>Successfully removed permissions from %n entry.</numerusform><numerusform>Successfully removed permissions from %n entries.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: No entry with permissions found!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>The active database does not contain an entry with permissions.</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>Application Settings</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>Security</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>Access error for config file %1</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>Basic Settings</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Start only a single instance of KeePassXC</translation>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>Remember last databases</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Remember last key files and security dongles</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Load previous databases on startup</translation>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>Automatically save on exit</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>Automatically save after every change</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automatically reload the database when modified externally</translation>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimize when copying to clipboard</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimize window at application startup</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation>Use group icon on entry creation</translation>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</translation>
+    </message>
+    <message>
+        <source>Hide the Details view</source>
+        <translation>Hide the Details view</translation>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>Show a system tray icon</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Hide window to system tray when minimized</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray instead of app exit</source>
+        <translation>Hide window to system tray instead of app exit</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation>Dark system tray icon</translation>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>Language</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Use entry title to match windows for global Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Use entry URL to match windows for global Auto-Type</translation>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation>Always ask before performing Auto-Type</translation>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Global Auto-Type shortcut</translation>
+    </message>
+    <message>
+        <source>Auto-Type delay</source>
+        <translation>Auto-Type delay</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation>Timeouts</translation>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>Clear clipboard after</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>Lock databases after inactivity of</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>Convenience</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lock databases when session is locked or lid is closed</translation>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>Lock databases after minimizing the window</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>Don&apos;t require password repeat when it is visible</translation>
+    </message>
+    <message>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Show passwords in cleartext by default</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the preview panel</source>
+        <translation>Hide passwords in the preview panel</translation>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation>Hide entry notes by default</translation>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>Privacy</translation>
+    </message>
+    <message>
+        <source>Use Google as fallback for downloading website icons</source>
+        <translation>Use Google as fallback for downloading website icons</translation>
+    </message>
+</context>
+<context>
+    <name>SetupTotpDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation>Setup TOTP</translation>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>Key:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation>Default RFC 6238 token settings</translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation>Steam token settings</translation>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation>Use custom settings</translation>
+    </message>
+    <message>
+        <source>Note: Change these settings only if you know what you are doing.</source>
+        <translation>Note: Change these settings only if you know what you are doing.</translation>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation>Time step:</translation>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation>8 digits</translation>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation>6 digits</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>Code size:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation> sec</translation>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>Timed Password</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>Copy</translation>
+    </message>
+    <message>
+        <source>Expires in</source>
+        <translation>Expires in</translation>
+    </message>
+    <message>
+        <source>seconds</source>
+        <translation>seconds</translation>
+    </message>
+</context>
+<context>
+    <name>UnlockDatabaseWidget</name>
+    <message>
+        <source>Unlock database</source>
+        <translation>Unlock database</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Welcome to KeePassXC</source>
+        <translation>Welcome to KeePassXC</translation>
+    </message>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation>Start storing your passwords securely in a KeePassXC database</translation>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation>Create new database</translation>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation>Open existing database</translation>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation>Import from KeePass 1</translation>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation>Import from CSV</translation>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation>Recent databases</translation>
+    </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation>Remove an entry from the database.</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Path of the database.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation>Path of the entry to remove.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - cross-platform password manager</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>filenames of the password databases to open (*.kdbx)</translation>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation>path to a custom config file</translation>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>key file of the database</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation>read password of the database from stdin</translation>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation>Parent window handle</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_es.ts b/share/translations/keepassx_es.ts
index 479284898..1b925e7c0 100644
--- a/share/translations/keepassx_es.ts
+++ b/share/translations/keepassx_es.ts
@@ -10,12 +10,32 @@
         <translation>Acerca de</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Reporte errores al: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC se distribuye bajo la Licencia Pública General de GNU (GPL) versión 2 o versión 3 (si así lo prefiere).</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Mantenedores del proyecto:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Contribuidores</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Ver contribuciones en GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
-        <translation>Información de Depuración</translation>
+        <translation>Información de depuración</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Incluya la información siguiente cuando informe sobre un error:</translation>
     </message>
     <message>
         <source>Copy to clipboard</source>
@@ -32,6 +52,10 @@
         <translation>Revisión: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribución: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Librerías:</translation>
     </message>
@@ -47,34 +71,14 @@ Núcleo: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Extensiones habilitadas:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Reporte errores al: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC se distribuye bajo la Licencia Pública General de GNU (GPL) versión 2 o versión 3 (si así lo prefiere).</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Mantenedores del proyecto:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Ver contribuciones en GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Incluya la información siguiente cuando informe sobre un error:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribución: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Confirmar acceso para KeePassXC HTTP</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Recordar esta decisión</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 ha solicitado acceso a las contraseñas de los siguientes item(s).
 Por favor seleccione si desea autorizar su acceso.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Confirmar acceso para KeePassXC HTTP</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Habilitar el Agente SSH (requiere reinicio)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Auto-Escritura - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Escritura</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>¡La sintaxis de la declaración de tu auto-escritura 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. ¿De verdad quieres 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. ¿De verdad quieres 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. ¿De verdad quieres continuar?</translation>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Por favor seleccione si desea autorizar su acceso.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Escritura - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Seleccionar entrada para Auto-Escritura:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Navegador Confirmar Acceso</translation>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-Escritura - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Recordar esta decisión</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permitir</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Denegar</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 ha solicitado acceso a las contraseñas de los siguientes ítems.
+Por favor seleccione si desea autorizar su acceso.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Cuadro de diálogo</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Esto es necesario para acceder a las bases de datos con KeePassXC-Navegador</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Permitir la integración de KeepassXC con el Navegador </translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Permitir la integración con estos navegadores:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Mostrar una &amp;notificación cuando las credenciales son requeridas</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Solicitar el desblo&amp;queo de la base de datos si se encuentra bloqueada</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Sólo se muestran las entradas con el mismo esquema (http://, https://,...)</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>&amp;Coinciden con el esquema de URL (ej. https://...)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Sólo devolver los resultados similares para una URL específica en vez de todas las entradas para todo el dominio.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>&amp;Mostrar sólo las mejores credenciales</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Ordenar las credenciales por &amp;título</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Ordenar las credenciales por &amp;usuario</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconectar todos los navegadores</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>Olvidar todos las &amp;permisos recordados</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avanzado</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Nunca &amp;pregunte antes de acceder a las credenciales</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Sólo las bases de datos seleccionadas se conectaran con el cliente.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>No se permite crear o actualizar campos de caracteres automáticamente.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Mostra&amp;r campos de caracteres avanzados que comiencen con &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>Apoya una aplicación proxy entre KeePassXC y una extensión de navegador.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Usar una ubicación proxy &amp;personalizada</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Navegar...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Advertencia:&lt;/b&gt; Las siguientes opciones pueden ser peligrosas.</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Archivos ejecutables (*.exe); Todos los archivos (*. *)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>Archivos ejecutables (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Elegir una ubicación de proxy personalizada</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Solicitud de asociación de nueva clave</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Guardar y permitir acceso</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: ¿Sobrescribir clave existente?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Actualizar entrada</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>¿Desea actualizar la información en %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: ¡Base de datos bloqueada!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>¡La base de datos activa está bloqueada!
+Por favor desbloquee la base de datos seleccionada o elija otra que esté desbloqueada.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: ¡Configuraciones no disponibles!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation>La base de datos activa no contiene una entrada de configuraciones.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: No se encontró ninguna clave</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation>No se encontraron claves de cifrado en las configuraciones de KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Las claves se eliminaron de la base de datos</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Eliminando permisos almacenados...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permisos eliminados</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: ¡No se encontró ninguna entrada con permisos!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de datos activa no contiene una entrada con permisos.</translation>
     </message>
 </context>
 <context>
@@ -149,14 +453,26 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>Repita la contraseña:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Archivo llave</translation>
+    </message>
+    <message>
         <source>Browse</source>
-        <translation>Abrir archivo</translation>
+        <translation>Navegar</translation>
     </message>
     <message>
         <source>Create</source>
         <translation>Crear</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Desa&amp;fío/Respuesta</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Actualizar</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Archivos llave</translation>
     </message>
@@ -177,6 +493,10 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>Seleccione un archivo llave</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Contraseña vacía</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>¿Realmente desea usar una cadena vacía como contraseña?</translation>
     </message>
@@ -191,20 +511,15 @@ Por favor seleccione si desea autorizar su acceso.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Archivo llave</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Desa&amp;fío/Respuesta</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Contraseña vacía</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>Opciones de Clonado</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Añadir &apos; - Clon&apos; a título</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Reemplaza nombre de usuario y contraseña con referencias</translation>
     </message>
@@ -225,10 +544,6 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <source>Copy history</source>
         <translation>Copiar historial</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Añadir &apos; - Clon&apos; a título</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Por favor seleccione si desea autorizar su acceso.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importar archivo CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Error</translation>
     </message>
@@ -340,17 +651,17 @@ Por favor seleccione si desea autorizar su acceso.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>byte,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>filas,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n fila(s), </numerusform><numerusform>%n fila(s), </numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>columnas</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n columna(s)</numerusform><numerusform>%n columna(s) </numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,14 +683,37 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>Navegar</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Actualizar</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Desafío/respuesta:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
-        <translation>Incapaz de abrir la base de datos.</translation>
+        <translation>No se pudo abrir la base de datos.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
         <translation>No se puede abrir el archivo llave</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Todos los archivos</translation>
     </message>
@@ -391,20 +725,12 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <source>Select key file</source>
         <translation>Seleccionar archivo llave</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Actualizar</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Desafío/respuesta:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
     <message>
         <source>Repair database</source>
-        <translation>Reparar base de datos</translation>
+        <translation>Reparar la base de datos</translation>
     </message>
     <message>
         <source>Error</source>
@@ -415,14 +741,14 @@ Por favor seleccione si desea autorizar su acceso.</translation>
         <translation>No se puede abrir el archivo llave</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Base de datos abierta correctamente. Nada que hacer.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>No se pudo abrir la base de datos.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Base de datos abierta correctamente. Nada que hacer.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Éxito</translation>
     </message>
@@ -440,40 +766,57 @@ Ahora puede guardarla.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nombre de la base de datos:</translation>
+        <source>General</source>
+        <translation>General</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Descripción de la base de datos:</translation>
+        <source>Encryption</source>
+        <translation>Cifrado</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Rondas de transformación:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Nombre de usuario por defecto:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Prueba de rendimiento</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Elementos máximos del historial:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Tamaño máximo del historial:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Usar papelera de reciclaje</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,19 +827,83 @@ Ahora puede guardarla.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmo:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Rondas de transformación:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nombre de la base de datos:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descripción de la base de datos:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nombre de usuario por defecto:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Elementos máximos del historial:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Tamaño máximo del historial:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Usar papelera de reciclaje</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Raíz</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>Base de datos KeePass 2</translation>
+        <translation>Base de datos de KeePass 2</translation>
     </message>
     <message>
         <source>All files</source>
@@ -511,22 +918,48 @@ Ahora puede guardarla.</translation>
         <translation>¡Archivo no encontrado!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Abrir base de datos KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>No se pudo abrir la base de datos.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de datos KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Archivo abierto en modo sólo lectura.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Abrir archivo CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Archivo CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Todos los archivos (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Unir base de datos</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir base de datos KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de datos KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>¿Cerrar?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;% 1&quot; está en el modo de edición.
+¿Descartar cambios y cerrar de todos modos?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>¿Guardar cambios?</translation>
     </message>
@@ -538,13 +971,25 @@ Save changes?</source>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>La escritura de la base de datos falló.</translation>
+        <translation>Fallo al escribir la base de datos.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Contraseñas</translation>
     </message>
     <message>
         <source>Save database as</source>
         <translation>Guardar base de datos como</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Exportar base de datos a un archivo CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>La escritura del archivo CSV falló.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nueva base de datos</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Por favor, pulse cancelar para terminar sus cambios o descartarlos.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Esta base de datos nunca ha sido guardada.
-Puede guardar la base de datos o dejar de bloquearla.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,69 +1015,14 @@ Otherwise your changes are lost.</source>
 ¿Desea guardar la base de datos antes de bloquearla?
 De lo contrario se perderán los cambios.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;% 1&quot; está en el modo de edición.
-¿Descartar cambios y cerrar de todos modos?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Exportar base de datos a un archivo CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Archivo CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>La escritura del archivo CSV falló.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>No se pudo abrir la base de datos.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Unir base de datos</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>La base de datos que intenta guardar está bloqueada por otra instancia de KeePassXC.
-¿Desea guardarla de todas formas?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Contraseñas</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>La base de datos ya está abierta</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>La base de datos que intenta abrir está bloqueada por otra instancia de KeePassXC.
-¿Desea abrirla de todas formas?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Abrir como sólo lectura</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Archivo abierto en modo sólo lectura.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Abrir archivo CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Buscando...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Cambiar la clave maestra</translation>
     </message>
@@ -659,36 +1043,44 @@ Do you want to open it anyway?</source>
         <translation>¿Realmente quiere eliminar las entradas &quot;%1&quot; de forma definitiva?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>¿Mover entrada a la papelera de reciclaje?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>¿Realmente quiere mover la entrada &quot;%1&quot; a la papelera de reciclaje?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>¿Mover entradas a la papelera de reciclaje?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>¿Realmente quiere mover la entrada &quot;%1&quot; a la papelera de reciclaje?</numerusform><numerusform>¿Realmente quiere mover las entradas &quot;%1&quot; a la papelera de reciclaje?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>¿Eliminar grupo?</translation>
+        <source>Execute command?</source>
+        <translation>¿Ejecutar comando?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>¿Realmente quiere eliminar el grupo &quot;%1&quot; de forma definitiva?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>¿Realmente desea ejecutar el siguiente comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No se puede calcular la llave maestra</translation>
+        <source>Remember my choice</source>
+        <translation>Recordar mi elección</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>¿Mover entrada a la papelera de reciclaje?</translation>
+        <source>Delete group?</source>
+        <translation>¿Eliminar grupo?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>¿Realmente quiere mover la entrada &quot;%1&quot; a la papelera de reciclaje?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>¿Realmente quiere eliminar el grupo &quot;%1&quot; de forma definitiva?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Buscando...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>No se puede calcular la clave maestra</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1099,8 @@ Do you want to open it anyway?</source>
         <translation>No hay resultados</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>¿Ejecutar comando?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>¿Realmente desea ejecutar el siguiente comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Recordar mi elección</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Solicitud de recarga automática</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1111,9 @@ Do you want to open it anyway?</source>
         <translation>Solicitud de Unión</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>El archivo de la base de datos ha cambiado y usted tiene modificaciones sin guardar. ¿Desea unir sus modificaciones?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1129,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Cerrar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nombre de usuario:</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Adjuntos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Ventana</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Secuencia</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Buscar</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpiar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1238,30 @@ Do you want to open it anyway?</source>
         <translation>Historial</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Historial de entradas</translation>
     </message>
@@ -794,22 +1282,20 @@ Do you want to open it anyway?</source>
         <translation>Nuevo atributo</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Seleccionar archivo</translation>
+        <source>Confirm Remove</source>
+        <translation>Confirmar eliminación</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Incapaz de abrir el archivo</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>¿Está seguro que desea eliminar este atributo?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Guardar adjunto</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Incapaz de guardar el adjunto:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1303,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semana</numerusform><numerusform>%n semana(s)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mes</numerusform><numerusform>%n mes(es)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 año</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmar eliminación</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>¿Está seguro que desea eliminar este atributo?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[PROTEGIDO] Presione revelar para ver o editar</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>¿Está seguro que desea eliminar este adjunto?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1329,6 @@ Do you want to open it anyway?</source>
         <translation>Eliminar</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Adjuntos</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Editar Nombre</translation>
     </message>
@@ -882,6 +1340,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>Revelar</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Adjuntos</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1352,18 @@ Do you want to open it anyway?</source>
         <translation>Activar Auto-Escritura 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>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Usar secuencia de Auto-Escritura personalizada:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Ventanas Asociadas</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1376,6 @@ Do you want to open it anyway?</source>
         <translation>Título de la ventana:</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>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usar secuencia de Auto-Escritura personalizada:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Usar secuencia por &amp;defecto</translation>
     </message>
@@ -917,10 +1383,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>Definir secuencia personalizada:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Ventanas Asociadas</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1406,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Título:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nombre de usuario:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1418,104 @@ Do you want to open it anyway?</source>
         <translation>Repetir:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Título:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expira</translation>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Programar</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notas:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nombre de usuario:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copiar al portapapeles</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Navegar...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1045,6 +1587,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Usar icono por defecto</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Usar icono &amp;personalizado</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Añadir icono personalizado</translation>
     </message>
@@ -1053,6 +1603,18 @@ Do you want to open it anyway?</source>
         <translation>Eliminar icono personalizado</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Descargar favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>No se pudo descargar el favicon</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Consejo: Puede activar Google como una alternativa en Herramientas &gt; Configuración &gt; Seguridad</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Imágenes</translation>
     </message>
@@ -1065,24 +1627,12 @@ Do you want to open it anyway?</source>
         <translation>Seleccionar imagen</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Descargar favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>No se pudo descargar el favicon</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>No se puede leer el ícono</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Usar icono por defecto</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Usar icono &amp;personalizado</translation>
+        <source>Custom icon already exists</source>
+        <translation>El icono personalizado ya existe</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1642,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Este ícono se utiliza en %1 entradas, y será modificado por el ícono por defecto. ¿Está seguro que desea eliminarlo?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Consejo: Puede activar Google como una alternativa en Herramientas &gt; Configuración &gt; Seguridad</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>El icono personalizado ya existe</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1666,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Clon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nombre</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Añadir</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirmar eliminación</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1146,7 +1772,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Username</source>
-        <translation>Nombre de usuario</translation>
+        <translation>Nombre de usuario:</translation>
     </message>
     <message>
         <source>URL</source>
@@ -1156,6 +1782,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -1171,11 +1802,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1811,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1884,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>No se puede calcular la clave maestra</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>No se pudo hacer el desafío/respuesta:</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>La contraseña es incorrecta o el archivo de la base de datos está dañado.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>No se pudo hacer el desafío/respuesta:</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>No se puede calcular la clave maestra</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>faltan las cabeceras de la base de datos</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>No se puede calcular la clave maestra</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Suma de verificación incorrecta de la cabecera</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Cabecera SHA256 diferente</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Clave equivocada o base de datos corrupta. (HMAC distinta)</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Algoritmo de cifrado desconocido</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Tamaño id de la cabecera inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Tamaño del campo en la cabecera inválido</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Tamaño del campo de datos en la cabecera incorrecto</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>No se puede calcular la clave maestra</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>No es una base de datos KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>El archivo seleccionado es una vieja base de datos de KeePass 1 (.kdb).
+
+Puede importarla haciendo clic en Base de datos &gt; &apos;Importar base de datos KeePass 1...&apos;.
+Esta migración es en único sentido. No podrá abrir la base de datos importada con la vieja versión 0.4 de KeePassX.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>Version de la base de datos de KeePass 2 no soportada.</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1254,7 +2246,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Incapaz de abrir la base de datos.</translation>
+        <translation>No se pudo abrir la base de datos.</translation>
     </message>
 </context>
 <context>
@@ -1276,6 +2268,35 @@ Do you want to open it anyway?</source>
         <translation>Versión de la base de datos KeePass no soportada.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Raíz</translation>
     </message>
@@ -1287,129 +2308,141 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>La contraseña es incorrecta o el archivo de la base de datos está dañado.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>No es una base de datos KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Versión de la base de datos KeePass no soportada.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>La contraseña es incorrecta o el archivo está dañado</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No se puede calcular la clave maestra</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>No se pudo hacer el desafío/respuesta:</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>El archivo seleccionado es una vieja base de datos de KeePass 1 (.kdb).
-
-Puede importarla haciendo clic en Base de datos &gt; &apos;Importar base de datos KeePass 1...&apos;.
-Esta migración es en único sentido. No podrá abrir la base de datos importada con la vieja versión 0.4 de KeePassX.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>No se pudo hacer el desafío/respuesta:</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>No se puede calcular la clave maestra</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Error fatal comprobando las funciones criptográficas.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Error</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>El archivo de bloqueo no pudo ser creado. Modo de instancia única deshabilitado.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Otra instancia de KeePassXC ya se está ejecutando.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Abrir base de datos</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Configuración de la base de datos</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Copiar nombre de usuario al portapapeles</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Copiar contraseña al portapapeles</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Configuración</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Mostrar barra de herramientas</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>sólo lectura</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Cambiar a ventana</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de datos de KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos los archivos</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Guardar base de datos reparada</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>El archivo de bloqueo de instancia única existente no es válido. Lanzando nueva instancia.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Fallo al escribir la base de datos.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>El archivo de bloqueo no pudo ser creado. Modo de instancia única deshabilitado.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Otra instancia de KeePassXC ya se está ejecutando.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Error fatal comprobando las funciones criptográficas.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Error</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>Base de &amp;Datos</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>Bases de datos &amp;recientes</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importar</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Ayuda</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>E&amp;ntradas</translation>
     </message>
@@ -1418,12 +2451,16 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Copiar at&amp;ributo al portapapeles</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Ver</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Herramientas</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2471,10 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Acerca de</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Abrir base de datos...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Guardar base de datos</translation>
     </message>
@@ -1474,24 +2515,24 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Eliminar grupo</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Configuración de la base de &amp;datos</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>&amp;Guardar base de datos como...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Clonar entrada</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Cambiar la clave &amp;maestra...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Contraseña programada de único uso</translation>
+        <source>&amp;Database settings</source>
+        <translation>Configuración de la base de &amp;datos</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Copiar &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Configuración de la base de datos</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Mostrar TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2543,26 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>Copiar nombre de &amp;usuario</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copiar nombre de usuario al portapapeles</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Cop&amp;iar contraseña</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copiar contraseña al portapapeles</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configuración</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Generador de contraseñas</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>Realizar Auto-&amp;Escritura</translation>
     </message>
@@ -1526,165 +2579,210 @@ Esta migración es en único sentido. No podrá abrir la base de datos importada
         <translation>&amp;Título</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notas</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Generador de contraseñas</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Limpiar historial</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exportar a un archivo CSV...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>Base de &amp;Datos</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importat base de datos KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importar</translation>
+        <source>Import CSV file...</source>
+        <translation>Importar archivo CSV...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Herramientas</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>&amp;Reparar base de datos...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Mostrar TOTP</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Vaciar papelera de reciclaje</translation>
+        <source>Set up TOTP...</source>
+        <translation>Configurar TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copiar &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Limpiar historial</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Error de acceso al archivo de configuración %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Salir de KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Por favor presione el botón en su YubiKey!</translation>
+        <source>read-only</source>
+        <translation>sólo lectura</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Ayuda</translation>
+        <source>Settings</source>
+        <translation>Configuración</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Abrir base de datos...</translation>
+        <source>Toggle window</source>
+        <translation>Cambiar a ventana</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>&amp;Guardar base de datos como...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Salir de KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Cambiar la clave &amp;maestra...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de datos de KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exportar a un archivo CSV...</translation>
+        <source>All files</source>
+        <translation>Todos los archivos</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importat base de datos KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Abrir base de datos</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importar archivo CSV...</translation>
+        <source>Save repaired database</source>
+        <translation>Guardar base de datos reparada</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>&amp;Reparar base de datos...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Fallo al escribir la base de datos.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Configurar TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Por favor presione el botón en su YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Cuadro de diálogo</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>General</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>M&amp;ostrar una notificación cuando se pidan credenciales</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordenar entradas por nombre de &amp;usuario</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Eli&amp;minar todos los permisos guardados de las entradas de la base de datos activa</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avanzado</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Siempre permitir &amp;acceso a las entradas</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Siempre permitir act&amp;ualizaciones de las entradas</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Busca&amp;r entradas que coincidan en todas las bases de datos abiertas</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Puerto HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Puerto por defecto: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Solicitar el desblo&amp;queo de la base de datos si se encuentra bloqueada</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordenar entradas por &amp;título</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC escuchará por este puerto en 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>No se puede asociar a puertos con privilegios</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>¡No se puede asociar a puertos con privilegios debajo de 1024!
-Usando el puerto por defecto 19455</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Eliminar todas las claves de cifrado compartidas de la base de datos activa</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Mostra&amp;r campos de caracteres avanzados que comiencen con &quot;KPH: &quot;</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>No se permite crear o actualizar campos de caracteres automáticamente.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Cuadro de diálogo</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1695,6 +2793,15 @@ Usando el puerto por defecto 19455</translation>
         <translation>Habilitar el servidor de KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>M&amp;ostrar una notificación cuando se pidan credenciales</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Sólo devolver los resultados similares para una URL específica en vez de todas las entradas para todo el dominio.</translation>
     </message>
@@ -1703,6 +2810,10 @@ Usando el puerto por defecto 19455</translation>
         <translation>&amp;Devolver sólo las entradas más relevantes</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Solicitar el desblo&amp;queo de la base de datos si se encuentra bloqueada</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Sólo se devuelven las entradas con el mismo esquema (http://, https://, ftp://, ...)</translation>
     </message>
@@ -1711,27 +2822,108 @@ Usando el puerto por defecto 19455</translation>
         <translation>&amp;Validar los esquemas de las URL</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Ordenar entradas por nombre de &amp;usuario</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Ordenar entradas por &amp;título</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Eliminar todas las claves de cifrado compartidas de la base de datos activa</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Eli&amp;minar todos los permisos guardados de las entradas de la base de datos activa</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Generador de contraseñas</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Avanzado</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Siempre permitir &amp;acceso a las entradas</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Siempre permitir act&amp;ualizaciones de las entradas</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Sólo las bases de datos seleccionadas se conectaran con el cliente.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>¡Las siguientes opciones son peligrosas!
-Cámbielas sólo si sabe lo que está haciendo.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Busca&amp;r entradas que coincidan en todas las bases de datos abiertas</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>No se permite crear o actualizar campos de caracteres automáticamente.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Mostra&amp;r campos de caracteres avanzados que comiencen con &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Puerto HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Puerto por defecto: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC escuchará por este puerto en 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Advertencia:&lt;/b&gt; Las siguientes opciones pueden ser peligrosas.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>No se puede asociar a puertos con privilegios</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>¡No se puede asociar a puertos con privilegios debajo de 1024!
+Usando el puerto por defecto 19455</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Contraseña:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>seguridad</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropía</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Tipos de caracteres</translation>
     </message>
@@ -1749,41 +2941,53 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation>Caracteres especiales:</translation>
+        <translation>Caracteres especiales</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII Extendido</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
         <translation>Excluir caracteres similares</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Aceptar</translation>
+        <source>Pick characters from every group</source>
+        <translation>Elegir caracteres de todos los grupos</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Longitud:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>seguridad</translation>
+        <source>Passphrase</source>
+        <translation>Frase de contraseña</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropía</translation>
+        <source>Wordlist:</source>
+        <translation>Lista de palabras:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Longitud:</translation>
+        <source>Word Count:</source>
+        <translation>Cantidad de Palabras:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Elegir caracteres de todos los grupos</translation>
+        <source>Word Separator:</source>
+        <translation>Separador de Palabras:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Generar</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Cerrar</translation>
     </message>
@@ -1801,51 +3005,270 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Pobre</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Débil</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Buena</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Excelente</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Contraseña</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII Extendido</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Frase de contraseña</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Lista de palabras:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Cantidad de Palabras:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Separador de Palabras:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Ruta a la base de datos.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Extraer e imprimir el contenido de la base de datos.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Ruta a la base de datos a extraer.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nombre del comando a ejecutar.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Listar las entradas de la base de datos.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Ruta del grupo a listar. Por defecto es /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Mezclar dos bases de datos.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Ruta de la base de datos resultado de la mezcla.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Ruta de la base de datos de inicio de la mezcla.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nombre de la entrada para mostrar.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Dispositivo NULL</translation>
@@ -1869,8 +3292,28 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
         <translation>comilla de cierre faltante</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>INTERNO - unget límite excedido</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1889,14 +3332,22 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Integración con Navegadores</translation>
     </message>
@@ -1912,6 +3363,10 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
         <source>Passive</source>
         <translation>Pasivo</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1950,8 +3405,8 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Distinguir mayúsculas/minúsculas</translation>
+        <source>Search...</source>
+        <translation>Buscar...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1962,8 +3417,8 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
         <translation>Limpiar</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Buscar...</translation>
+        <source>Case Sensitive</source>
+        <translation>Distinguir mayúsculas/minúsculas</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1973,50 +3428,6 @@ Cámbielas sólo si sabe lo que está haciendo.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Ya existe una clave de cifrado con el nombre %1.
-¿Desea sobrescribirla?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>¿Desea actualizar la información en %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>¡La base de datos activa está bloqueada!
-Por favor desbloquee la base de datos seleccionada o elija otra que esté desbloqueada.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Se eliminó con éxito %1 %2 de cifrado de la configuración de KeePassX/Http.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>No se encontraron claves de cifrado en la configuración de KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>La base de datos activa no contiene una entrada de configuración de KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Eliminando los permisos guardados...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Abortar</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Los permisos de %1 %2 fueron eliminados exitosamente.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de datos activa no contiene una entrada con permisos.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Solicitud de asociación de nueva clave</translation>
     </message>
@@ -2033,33 +3444,77 @@ asigne un nombre único para identificarla y acepte.</translation>
         <translation>KeePassXC: ¿Sobrescribir clave existente?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Ya existe una clave de cifrado con el nombre %1.
+¿Desea sobrescribirla?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Actualizar entrada</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>¿Desea actualizar la información en %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: ¡Base de datos bloqueada!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>¡La base de datos activa está bloqueada!
+Por favor desbloquee la base de datos seleccionada o elija otra que esté desbloqueada.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Las claves se eliminaron de la base de datos</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: No se encontró ninguna clave</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>No se encontraron claves de cifrado en la configuración de KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: ¡Configuraciones no disponibles!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>La base de datos activa no contiene una entrada de configuración de KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Eliminando los permisos guardados...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Permisos eliminados</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: ¡No se encontró ninguna entrada con permisos!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de datos activa no contiene una entrada con permisos.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2083,10 +3538,26 @@ asigne un nombre único para identificarla y acepte.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Configuraciones Básicas</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Inicie sólo una instancia de KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Recordar última base de datos</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Recordar los últimos archivos de llaves y el dongle de seguridad</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Abrir base de datos anterior al inicio</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Guardar automáticamente al salir</translation>
     </message>
@@ -2095,20 +3566,28 @@ asigne un nombre único para identificarla y acepte.</translation>
         <translation>Guardar automáticamente después de cada cambio</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Recargar automáticamente la base de datos cuando sea modificada externamente</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimizar al copiar al portapapeles</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizar la ventana al iniciar</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Usar icono del grupo en la creación de entrada</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Atajo global de Auto-Escritura</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>No marcar la base de datos como modificada cuando los cambios no afecten a los datos (ej. expandir grupos)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2119,66 +3598,60 @@ asigne un nombre único para identificarla y acepte.</translation>
         <translation>Ocultar la ventana a la bandeja del sistema cuando se minimiza</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Abrir base de datos anterior al inicio</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Recargar automáticamente la base de datos cuando sea modificada externamente</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Ocultar la ventana a la bandeja del sistema en vez de cerrar</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimizar la ventana al iniciar</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Configuraciones Básicas</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Recordar los últimos archivos de llaves y el dongle de seguridad</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>No marcar la base de datos como modificada cuando los cambios no afecten a los datos (ej. expandir grupos)</translation>
+        <source>Language</source>
+        <translation>Idioma</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Auto-Escritura</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Usar URL y título de la entrada para igualar ventanas para Auto-Escritura global</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Siempre preguntar antes de hacer Auto-Escritura</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atajo global de Auto-Escritura</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Retardo de Auto-Escritura</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>Micro segundo</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Inicie sólo una instancia de KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Intervalos</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Limpiar el portapapeles después de</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>segundos</translation>
     </message>
     <message>
@@ -2186,8 +3659,12 @@ asigne un nombre único para identificarla y acepte.</translation>
         <translation>Bloquear base de datos tras un periodo de inactividad de</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostrar contraseñas en texto claro por defecto</translation>
+        <source>Convenience</source>
+        <translation>Conveniencia</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Bloquear base de datos cuando la sesión está bloqueada o la pantalla esté cerrada</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2198,16 +3675,16 @@ asigne un nombre único para identificarla y acepte.</translation>
         <translation>No pedir repetición de la contraseña cuando está visible</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Intervalos</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Mostrar contraseñas en texto claro por defecto</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniencia</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloquear base de datos cuando la sesión está bloqueada o la pantalla esté cerrada</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2229,6 +3706,14 @@ asigne un nombre único para identificarla y acepte.</translation>
         <translation>Clave:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Usar configuración personalizada</translation>
     </message>
@@ -2254,6 +3739,7 @@ asigne un nombre único para identificarla y acepte.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>segundos</translation>
     </message>
 </context>
@@ -2321,88 +3807,40 @@ asigne un nombre único para identificarla y acepte.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>ruta a un archivo de configuración personalizado</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>archivo llave de la base de datos</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - gestor de claves multiplataforma</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>leer contraseña de la base de datos desde la entrada estándar</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nombre de archivo de la base de datos de contraseñas a abrir (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Copiar contraseña al portapapeles</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Ruta a la base de datos.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Usar una ventana de diálogo para desbloquear la base de datos.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Nombre de la entrada para cortar.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Extraer e imprimir el contenido de la base de datos.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Ruta a la base de datos a extraer.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nombre del comando a ejecutar.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Listar las entradas de la base de datos.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Ruta del grupo a listar. Por defecto es /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation> Imprimir los UUIDs de las entradas y grupos.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Mezclar dos bases de datos.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gestor de claves multiplataforma</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Ruta de la base de datos resultado de la mezcla.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nombre de archivo de la base de datos de contraseñas a abrir (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Ruta de la base de datos de inicio de la mezcla.</translation>
+        <source>path to a custom config file</source>
+        <translation>ruta a un archivo de configuración personalizado</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Usar la misma contraseña para ambas bases de datos.</translation>
+        <source>key file of the database</source>
+        <translation>archivo llave de la base de datos</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Mostrar contraseña.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>leer contraseña de la base de datos desde la entrada estándar</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nombre de la entrada para mostrar.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_eu.ts b/share/translations/keepassx_eu.ts
index ffbb4a9a5..7d7dbd32d 100644
--- a/share/translations/keepassx_eu.ts
+++ b/share/translations/keepassx_eu.ts
@@ -10,11 +10,31 @@
         <translation>Honi buruz</translation>
     </message>
     <message>
-        <source>Contributors</source>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Akatsen berri eman hemen: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Contributors</source>
+        <translation>Lankideak</translation>
+    </message>
+    <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Ikusi ekarpenak GitHub-en&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
+        <translation>Arazketa informazioa</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -29,7 +49,11 @@
     </message>
     <message>
         <source>Revision: %1</source>
-        <translation type="unfinished"/>
+        <translation>Berrikuspena: %1</translation>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation>Banaketa: %1</translation>
     </message>
     <message>
         <source>Libraries:</source>
@@ -39,69 +63,74 @@
         <source>Operating system: %1
 CPU architecture: %2
 Kernel: %3 %4</source>
-        <translation type="unfinished"/>
+        <translation>Sistema eragilea: %1
+CPU arkitektura: %2
+Kernel: %3 %4</translation>
     </message>
     <message>
         <source>Enabled extensions:</source>
         <translation>Gaitutako hedapenak:</translation>
     </message>
+</context>
+<context>
+    <name>AccessControlDialog</name>
     <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <source>KeePassXC HTTP Confirm Access</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation type="unfinished"/>
+        <source>Remember this decision</source>
+        <translation>Gogoratu erabaki hau</translation>
     </message>
     <message>
-        <source>Project Maintainers:</source>
-        <translation type="unfinished"/>
+        <source>Allow</source>
+        <translation>Onartu</translation>
     </message>
     <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Ikusi ekarpenak GitHub-en&lt;/a&gt;</translation>
+        <source>Deny</source>
+        <translation>Debekatu</translation>
     </message>
     <message>
-        <source>Include the following information whenever you report a bug:</source>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>Distribution: %1</source>
+        <source>Enable SSH Agent (requires restart)</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>AccessControlDialog</name>
+    <name>AutoType</name>
     <message>
-        <source>Remember this decision</source>
-        <translation>Gogoratu erabaki hau</translation>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Onartu</translation>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Deny</source>
-        <translation>Debekatu</translation>
+        <source>Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>%1 has requested access to passwords for the following item(s).
-Please select whether you want to allow access.</source>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>AutoType</name>
     <message>
-        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -123,11 +152,286 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Gogoratu erabaki hau</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Onartu</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Debekatu</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Elkarrizketa</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Aurreratua</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Arakatu...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Gainidatzi aurreko gakoa?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Eguneratu sarrera</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ez da gakorik aurkitu</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Gordetako baimenak kentzen...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Kendutako baimenak</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -146,14 +450,26 @@ Please select whether you want to allow access.</source>
         <translation>Errepikatu pasahitza:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Gako fitxategia</translation>
+    </message>
+    <message>
         <source>Browse</source>
-        <translation type="unfinished"/>
+        <translation>Arakatu</translation>
     </message>
     <message>
         <source>Create</source>
         <translation>Sortu</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Freskatu</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Gako fitxategiak</translation>
     </message>
@@ -174,6 +490,10 @@ Please select whether you want to allow access.</source>
         <translation>Aukeratu gako fitxategia</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Hustu pasahitza</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Kate hutsa pasahitz modura erabili?</translation>
     </message>
@@ -187,20 +507,15 @@ Please select whether you want to allow access.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Gako fitxategia</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Freskatu</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Hustu pasahitza</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -211,6 +526,10 @@ Please select whether you want to allow access.</source>
     <name>CloneDialog</name>
     <message>
         <source>Clone Options</source>
+        <translation>Klonatu aukerak</translation>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -221,10 +540,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>Kopiatu historia</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -321,10 +636,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Inportatu CSV fitxategia</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Errorea</translation>
     </message>
@@ -335,17 +646,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>byte,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>byte %n</numerusform><numerusform>%n byte</numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>errenkada,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>lerro %n</numerusform><numerusform>%n lerro</numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>zutabe,</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>zutabe %n</numerusform><numerusform>%n zutabe</numerusform></translation>
     </message>
 </context>
 <context>
@@ -364,6 +675,14 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Browse</source>
+        <translation>Arakatu</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Freskatu</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -375,6 +694,21 @@ Please select whether you want to allow access.</source>
         <translation>Ezin da gako fitxategia ireki</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Fitxategi guztiak</translation>
     </message>
@@ -386,14 +720,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>Aukeratu gako-fitxategia</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Freskatu</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -410,14 +736,14 @@ Please select whether you want to allow access.</source>
         <translation>Ezin da gako fitxategia ireki</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Ezin izan da datu-basea ireki.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Success</source>
         <translation type="unfinished"/>
     </message>
@@ -435,41 +761,58 @@ Gorde daiteke orain.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Datu-basearen izena:</translation>
+        <source>General</source>
+        <translation>Orokorra</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Datu-basearen deskribapena:</translation>
+        <source>Encryption</source>
+        <translation>Zifraketa</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Lehenetsitako erabiltzaile-izena:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation>Utzi</translation>
     </message>
     <message>
-        <source>Benchmark</source>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
+        <source>KDF unchanged</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Zifraketa algoritmoa</translation>
+    </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
         <translation>AES:  256 Bit   (lehenetsia)</translation>
@@ -479,153 +822,197 @@ Gorde daiteke orain.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmoa:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>DatabaseTabWidget</name>
     <message>
-        <source>Root</source>
+        <source>Transform rounds:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 datu-basea</translation>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Fitxategi guztiak</translation>
+        <source>Memory Usage:</source>
+        <translation>Memoria erabilera:</translation>
     </message>
     <message>
-        <source>Open database</source>
-        <translation>Ireki datu-basea</translation>
+        <source> MB</source>
+        <translation> MB</translation>
     </message>
     <message>
-        <source>File not found!</source>
-        <translation>Fitxategia ez da aurkitu!</translation>
+        <source>Parallelism:</source>
+        <translation>Paralelismoa:</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Ireki KeePass 1 datu-basea</translation>
+        <source> thread</source>
+        <translation>haria</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 datu-basea</translation>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files (*)</source>
-        <translation>Fitxategi guztiak (*)</translation>
+        <source>Database name:</source>
+        <translation>Datu-basearen izena:</translation>
     </message>
     <message>
-        <source>Close?</source>
-        <translation>Itxi?</translation>
+        <source>Database description:</source>
+        <translation>Datu-basearen deskribapena:</translation>
     </message>
     <message>
-        <source>Save changes?</source>
-        <translation>Aldaketak gorde?</translation>
+        <source>Default username:</source>
+        <translation>Lehenetsitako erabiltzaile-izena:</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; was modified.
-Save changes?</source>
+        <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
+        <source>Max. history items:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save database as</source>
-        <translation>Gorde datu-basea honela</translation>
+        <source>Max. history size:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>New database</source>
-        <translation>Datu-base berria</translation>
+        <source> MiB</source>
+        <translation> MiB</translation>
     </message>
     <message>
-        <source>locked</source>
+        <source>Use recycle bin</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
     <message>
-        <source>Lock database</source>
+        <source>Root</source>
+        <comment>Root group</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Can't lock the database as you are currently editing it.
-Please press cancel to finish your changes or discard them.</source>
-        <translation type="unfinished"/>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 datu-basea</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation type="unfinished"/>
+        <source>All files</source>
+        <translation>Fitxategi guztiak</translation>
     </message>
     <message>
-        <source>This database has been modified.
-Do you want to save the database before locking it?
-Otherwise your changes are lost.</source>
-        <translation type="unfinished"/>
+        <source>Open database</source>
+        <translation>Ireki datu-basea</translation>
     </message>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
+        <source>File not found!</source>
+        <translation>Fitxategia ez da aurkitu!</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Ezin izan da datu-basea ireki.</translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Export database to CSV file</source>
-        <translation>Esportatu datu-basea CSV fitxategira</translation>
+        <source>Open CSV file</source>
+        <translation>Ireki CSV fitxategia</translation>
     </message>
     <message>
         <source>CSV file</source>
         <translation>CSV fitxategia</translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
+        <source>All files (*)</source>
+        <translation>Fitxategi guztiak (*)</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>Bateratu datu-basea</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Ireki KeePass 1 datu-basea</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 datu-basea</translation>
+    </message>
+    <message>
+        <source>Close?</source>
+        <translation>Itxi?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Ezin izan da datu-basea ireki.</translation>
+        <source>Save changes?</source>
+        <translation>Aldaketak gorde?</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Bateratu datu-basea</translation>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
+        <source>Writing the database failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Passwords</source>
-        <translation type="unfinished"/>
+        <translation>Pasahitzak</translation>
     </message>
     <message>
-        <source>Database already opened</source>
+        <source>Save database as</source>
+        <translation>Gorde datu-basea honela</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>Esportatu datu-basea CSV fitxategira</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
+        <source>New database</source>
+        <translation>Datu-base berria</translation>
+    </message>
+    <message>
+        <source>locked</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open read-only</source>
+        <source>Lock database</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
+        <source>Can't lock the database as you are currently editing it.
+Please press cancel to finish your changes or discard them.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>Ireki CSV fitxategia</translation>
+        <source>This database has been modified.
+Do you want to save the database before locking it?
+Otherwise your changes are lost.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Bilatzen...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Aldatu gako nagusia</translation>
     </message>
@@ -646,36 +1033,44 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Ziur zaude sarrera %n zakarrontzira mugitu nahi duzula?</numerusform><numerusform>Ziur zaude %n sarrera zakarrontzira mugitu nahi dituzula?</numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Ezabatu taldea?</translation>
+        <source>Execute command?</source>
+        <translation>Exekutatu komandoa?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ezin izan da gako nagusia kalkulatu</translation>
+        <source>Remember my choice</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation type="unfinished"/>
+        <source>Delete group?</source>
+        <translation>Ezabatu taldea?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Bilatzen...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Ezin izan da gako nagusia kalkulatu</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -694,45 +1089,117 @@ Do you want to open it anyway?</source>
         <translation>Emaitzarik ez</translation>
     </message>
     <message>
-        <source>Execute command?</source>
+        <source>File has changed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <source>The database file has changed. Do you want to load the changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Remember my choice</source>
+        <source>Merge Request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Autoreload Request</source>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge Request</source>
+        <source>Empty recycle bin?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
+        <source>Close</source>
+        <translation>Itxi</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Pasahitza</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Iraungitzea</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Erabiltzaile-izena</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <source>Searching</source>
+        <translation>Bilatzen</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Oharrak</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Leihoa</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekuentzia</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Bilatu</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Garbitu</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Inoiz</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[BABESTUA]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Ezgaitua</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Gaitua</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidget</name>
@@ -761,10 +1228,34 @@ Do you want to open it anyway?</source>
         <translation>Historia</translation>
     </message>
     <message>
-        <source>Entry history</source>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(zifratua)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Entry history</source>
+        <translation>Sarrera historia</translation>
+    </message>
+    <message>
         <source>Add entry</source>
         <translation>Gehitu sarrera</translation>
     </message>
@@ -778,23 +1269,22 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>New attribute</source>
-        <translation type="unfinished"/>
+        <translation>Gehitu ezaugarria</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Aukeratu fitxategia</translation>
+        <source>Confirm Remove</source>
+        <translation>Baieztatu kentzea</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
+        <source>Are you sure you want to remove this attribute?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation type="unfinished"/>
+        <source>[PROTECTED]</source>
+        <translation>[BABESTUA]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
+        <source>Press reveal to view or edit</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -803,32 +1293,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>aste %n</numerusform><numerusform>%n aste</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>hilabete %n</numerusform><numerusform>%n hilabete</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>urte 1</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -845,18 +1319,6 @@ Do you want to open it anyway?</source>
         <translation>Kendu</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Gorde</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Ireki</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Izena editatu</translation>
     </message>
@@ -868,6 +1330,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -876,35 +1342,35 @@ Do you want to open it anyway?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>+</source>
-        <translation>+</translation>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>-</source>
-        <translation>-</translation>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Window title:</source>
+        <source>Window Associations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation type="unfinished"/>
+        <source>+</source>
+        <translation>+</translation>
     </message>
     <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
+        <source>-</source>
+        <translation>-</translation>
     </message>
     <message>
-        <source>Use default se&amp;quence</source>
-        <translation type="unfinished"/>
+        <source>Window title:</source>
+        <translation>Leihoaren izenburua:</translation>
     </message>
     <message>
-        <source>Set custo&amp;m sequence:</source>
+        <source>Use default se&amp;quence</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Window Associations</source>
+        <source>Set custo&amp;m sequence:</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -916,7 +1382,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"/>
+        <translation>Berrezarri</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -930,36 +1396,116 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Pasahitza:</translation>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>Errepikatu:</translation>
+    </message>
+    <message>
         <source>Title:</source>
         <translation>Izenburua:</translation>
     </message>
     <message>
+        <source>Notes</source>
+        <translation>Oharrak</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Username:</source>
         <translation>Erabitzaile-izena:</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Pasahitza:</translation>
+        <source>Expires</source>
+        <translation>Iraungitzea</translation>
     </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
     <message>
-        <source>Repeat:</source>
-        <translation>Errepikatu:</translation>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Expires</source>
+        <source> seconds</source>
+        <translation>segundu</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Presets</source>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Gako publikoa</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Iruzkina</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Deszifratu</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Kopiatu arbelera</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Gako pribatua</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Arakatu...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Eranskina</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Oharrak:</translation>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1009,7 +1555,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Expires</source>
-        <translation type="unfinished"/>
+        <translation>Iraungitzea</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1031,6 +1577,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Gehitu ikono pertsonalizatua</translation>
     </message>
@@ -1039,6 +1593,18 @@ Do you want to open it anyway?</source>
         <translation>Ezabatu ikono pertsonalizatua</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Deskargatu favicon-a</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Ezin izan da favicon-a atzitu.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Irudiak</translation>
     </message>
@@ -1051,23 +1617,11 @@ Do you want to open it anyway?</source>
         <translation>Aukeratu irudia</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Deskargatu favicon-a</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Ezin izan da favicon-a atzitu.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
+        <source>Custom icon already exists</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1078,14 +1632,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1110,6 +1656,90 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
+        <translation> - Klonatu</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Izena</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamainua</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Gehitu</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Kendu</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Ireki</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Gorde</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Aukeratu fitxategiak</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>Ziur zaude eranskin %n kendu nahi duzula?</numerusform><numerusform>Ziur zaude %n eranskin kendu nahi dituzula?</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Baieztatu kentzea</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Gorde eranskinak</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1142,6 +1772,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Taldea</translation>
     </message>
@@ -1157,16 +1792,22 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>Group</name>
     <message>
         <source>Recycle Bin</source>
+        <translation>Zakarrontzia</translation>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1233,36 +1874,163 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
-    <name>KeePass1OpenWidget</name>
+    <name>Kdbx3Reader</name>
     <message>
-        <source>Import KeePass1 database</source>
-        <translation>Inportatu Keepass1 datu-basea</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Ezin izan da gako nagusia kalkulatu</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Ezin izan da datu-basea ireki.</translation>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KeePass1Reader</name>
+    <name>Kdbx3Writer</name>
     <message>
-        <source>Unable to read keyfile.</source>
+        <source>Unable to issue challenge-response.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Ez da KeePass datu-basea.</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Ezin izan da gako nagusia kalkulatu</translation>
     </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
     <message>
-        <source>Unsupported encryption algorithm.</source>
+        <source>missing database headers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
+        <source>Unable to calculate master key</source>
+        <translation>Ezin izan da gako nagusia kalkulatu</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Root</source>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1270,297 +2038,470 @@ Do you want to open it anyway?</source>
         <translation>Ezin izan da gako nagusia kalkulatu</translation>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>KeePass2Reader</name>
+    <name>KdbxReader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Ez da KeePass datu-basea.</translation>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
+        <source>Unsupported cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
+        <source>Invalid compression flags length</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ezin izan da gako nagusia kalkulatu</translation>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Ez da KeePass datu-basea.</translation>
+    </message>
+    <message>
         <source>The selected file is an old KeePass 1 database (.kdb).
 
 You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
 This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>KeePass2Writer</name>
+    <name>KdbxXmlReader</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>XML parsing failure: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ezin izan da gako nagusia kalkulatu</translation>
+        <source>No root group</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Missing icon uuid or data</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Errorea</translation>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Multiple group elements</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Null group uuid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Invalid group icon number</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Ireki datu-basea</translation>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Datu-basearen ezarpenak</translation>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Kopiatu erabiltzaile-izena arbelera</translation>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Kopiatu pasahitza arbelera</translation>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ezarpenak</translation>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Erakutsi tresna-barra</translation>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
+        <source>Invalid entry icon number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>History element in history entry</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 datu-basea</translation>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Fitxategi guztiak</translation>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
+        <source>Unable to decrypt entry string</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
+        <source>Duplicate custom attribute found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Recent databases</source>
+        <source>Entry string key or value missing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>E&amp;ntries</source>
+        <source>Duplicate attachment found</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy att&amp;ribute to clipboard</source>
+        <source>Entry binary key or value missing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Groups</source>
+        <source>Auto-type association window or sequence missing</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View</source>
+        <source>Invalid bool value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Quit</source>
+        <source>Invalid date time value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;About</source>
+        <source>Invalid color value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Save database</source>
+        <source>Invalid color rgb part</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Close database</source>
+        <source>Invalid number value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;New database</source>
+        <source>Invalid uuid value</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge from KeePassX database</source>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
     <message>
-        <source>&amp;Add new entry</source>
+        <source>Import KeePass1 database</source>
+        <translation>Inportatu Keepass1 datu-basea</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>Ezin izan da datu-basea ireki.</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;View/Edit entry</source>
+        <source>Not a KeePass database.</source>
+        <translation>Ez da KeePass datu-basea.</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete entry</source>
+        <source>Unsupported KeePass database version.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Add new group</source>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Edit group</source>
+        <source>Invalid number of groups</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Delete group</source>
+        <source>Invalid number of entries</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database settings</source>
+        <source>Invalid content hash size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
+        <source>Invalid transform seed size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
+        <source>Invalid number of transform rounds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
+        <source>Unable to construct group tree</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show TOTP</source>
+        <source>Root</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Find</source>
+        <source>Unable to calculate master key</source>
+        <translation>Ezin izan da gako nagusia kalkulatu</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy &amp;username</source>
+        <source>Key transformation failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cop&amp;y password</source>
+        <source>Invalid group field type number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Settings</source>
+        <source>Invalid group field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Perform Auto-Type</source>
+        <source>Read group field data doesn&apos;t match size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open URL</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Lock databases</source>
+        <source>Incorrect group creation time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Title</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;URL</source>
+        <source>Incorrect group access time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Notes</source>
+        <source>Incorrect group expiry time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Pasahitz sortzailea</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Garbitu historia</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
+        <source>Invalid group field type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Inportatu</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
+        <source>Missing entry field type number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>Invalid entry field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Read entry field data doesn&apos;t match size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Irten KeePassXC-tik</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Errorea</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Datu-basea</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>Inportatu</translation>
+    </message>
     <message>
         <source>&amp;Help</source>
+        <translation>&amp;Laguntza</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation>Sa&amp;rrerak</translation>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation>&amp;Taldeak</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>&amp;Tresnak</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>&amp;Irten</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>&amp;Honi buruz</translation>
+    </message>
+    <message>
         <source>&amp;Open database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>&amp;Save database</source>
+        <translation>&amp;Gorde datubasea</translation>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation>&amp;Itxi datubasea</translation>
+    </message>
+    <message>
+        <source>&amp;New database</source>
+        <translation>&amp;Datu-base berria</translation>
+    </message>
+    <message>
+        <source>Merge from KeePassX database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Add new entry</source>
+        <translation>&amp;Gehitu sarrera berria</translation>
+    </message>
+    <message>
+        <source>&amp;View/Edit entry</source>
+        <translation>&amp;Ikusi/Editatu sarrera</translation>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation>&amp;Ezabatu sarrera</translation>
+    </message>
+    <message>
+        <source>&amp;Add new group</source>
+        <translation>&amp;Gehitu talde berria</translation>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation>&amp;Editatu taldea</translation>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>&amp;Ezabatu taldea</translation>
+    </message>
+    <message>
         <source>Sa&amp;ve database as...</source>
         <translation type="unfinished"/>
     </message>
@@ -1569,6 +2510,82 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Datu-basearen ezarpenak</translation>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation>Datu-basearen ezarpenak</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Klonatu sarrera</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>&amp;Bilatu</translation>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation>Kopiatu &amp;erabiltzailea</translation>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation>Kopiatu erabiltzaile-izena arbelera</translation>
+    </message>
+    <message>
+        <source>Cop&amp;y password</source>
+        <translation>Kopiatu pasahitza</translation>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation>Kopiatu pasahitza arbelera</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>&amp;Ezarpenak</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>Pasahitz sortzailea</translation>
+    </message>
+    <message>
+        <source>&amp;Perform Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation>&amp;Izenburua</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation>&amp;URL</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation>&amp;Oharrak</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Export to CSV file...</source>
         <translation type="unfinished"/>
     </message>
@@ -1585,90 +2602,176 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Show TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Set up TOTP...</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Garbitu historia</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read-only</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Ezarpenak</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>Irten KeePassXC-tik</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 datu-basea</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Fitxategi guztiak</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Ireki datu-basea</translation>
+    </message>
+    <message>
+        <source>Save repaired database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Elkarrizketa</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Orokorra</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Aurreratua</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP portua:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Portu lehenetsia: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Unknown KDF: </source>
+        <translation>KDF ezezaguna:</translation>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Unknown key type: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Can&apos;t write public key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Elkarrizketa</translation>
+    </message>
+    <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
         <translation>Hau beharrezkoa da ChromeIPass edo PassIFox erabilita datu-baseetara sarbidea izateko</translation>
     </message>
@@ -1677,6 +2780,15 @@ Using default port 19455.</source>
         <translation>Gaitu KeePassHTTP zerbitzaria</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Orokorra</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"/>
     </message>
@@ -1685,6 +2797,10 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation type="unfinished"/>
     </message>
@@ -1693,26 +2809,107 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Pasahitz sortzailea</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Aurreratua</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP portua:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Portu lehenetsia: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Pasahitza:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>sendotasuna</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Pasahitza</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Karaktere motak</translation>
     </message>
@@ -1733,38 +2930,50 @@ Change them only if you know what you are doing.</source>
         <translation>Karaktere bereziak</translation>
     </message>
     <message>
-        <source>Exclude look-alike characters</source>
+        <source>Extended ASCII</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Onartu</translation>
+        <source>Exclude look-alike characters</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>%p%</source>
+        <source>Pick characters from every group</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>strength</source>
-        <translation>sendotasuna</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Luzeera:</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropia</translation>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation type="unfinished"/>
+        <source>Wordlist:</source>
+        <translation>Hitz zerrenda:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation type="unfinished"/>
+        <source>Word Count:</source>
+        <translation>Hitz kopurua:</translation>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation>Hitz banatzailea:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Sortu</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Kopiatu</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Onartu</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Itxi</translation>
     </message>
@@ -1782,51 +2991,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Txarra</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Ahula</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Ona</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Bikaina</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Pasahitza</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
+        <source>Timeout or cannot connect to KeePassXC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
+        <source>Action cancelled or denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopiatu</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>erabiltzaile-izena</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>luzeera</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Editatu sarrera bat.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Sarreraren izenburua.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>Izenburua</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Zerrendatu datu-baseko sarrerak.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Bateratu bi datu-base.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>ezaugarria</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Erakutsiko den sarreraren izena.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation type="unfinished"/>
@@ -1838,7 +3266,7 @@ Change them only if you know what you are doing.</source>
     <message>
         <source>file empty !
 </source>
-        <translation type="unfinished"/>
+        <translation>fitxategia hutsik dago!</translation>
     </message>
     <message>
         <source>malformed string</source>
@@ -1849,8 +3277,28 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation type="unfinished"/>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – gomendatua)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1869,14 +3317,22 @@ Change them only if you know what you are doing.</source>
         <translation>Pasahitza</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Oharrak</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>Azken aldaketa</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
@@ -1886,12 +3342,16 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Press</source>
-        <translation type="unfinished"/>
+        <translation>Sakatu</translation>
     </message>
     <message>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1930,8 +3390,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation type="unfinished"/>
+        <source>Search...</source>
+        <translation>Bilatu...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1942,8 +3402,8 @@ Change them only if you know what you are doing.</source>
         <translation>Garbitu</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Bilatu...</translation>
+        <source>Case Sensitive</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1953,89 +3413,89 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
+        <source>KeePassXC: New key association request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Gainidatzi aurreko gakoa?</translation>
     </message>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Eguneratu sarrera</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <source>Do you want to update the information in %1 - %2?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>KeePassXC: Database locked!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Successfully removed permissions from %1 %2.</source>
+        <source>KeePassXC: Removed keys from database</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ez da gakorik aurkitu</translation>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Gainidatzi aurreko gakoa?</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Eguneratu sarrera</translation>
-    </message>
-    <message>
-        <source>KeePassXC: Database locked!</source>
+        <source>KeePassXC: Settings not available!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Ez da gakorik aurkitu</translation>
+        <source>Removing stored permissions...</source>
+        <translation>Gordetako baimenak kentzen...</translation>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
+        <source>Abort</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: Kendutako baimenak</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2059,10 +3519,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Oinarrizko ezarpenak</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Gogoratu azken datu-baseak</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Automatikoki gorde irtetean</translation>
     </message>
@@ -2071,20 +3547,28 @@ give it a unique name to identify and accept it.</source>
         <translation>Automatikoki gorde aldaketa oro eta gero</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimizatu arbelera kopiatzean</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Erabili taldearen ikonoa sarrera sortzean</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Hizkuntza</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2095,43 +3579,35 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
+        <source>Dark system tray icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Basic Settings</source>
-        <translation>Oinarrizko ezarpenak</translation>
+        <source>Language</source>
+        <translation>Hizkuntza</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Always ask before performing Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>Global Auto-Type shortcut</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2140,21 +3616,23 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
+        <comment>Milliseconds</comment>
+        <translation> ms</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2162,7 +3640,11 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2174,15 +3656,15 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timeouts</source>
+        <source>Show passwords in cleartext by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Hide passwords in the preview panel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Hide entry notes by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2202,6 +3684,14 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source>Key:</source>
+        <translation>Gakoa:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2218,11 +3708,11 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source>8 digits</source>
-        <translation type="unfinished"/>
+        <translation>8 zifra</translation>
     </message>
     <message>
         <source>6 digits</source>
-        <translation type="unfinished"/>
+        <translation>6 zifra</translation>
     </message>
     <message>
         <source>Code size:</source>
@@ -2230,6 +3720,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -2297,27 +3788,7 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>datu-basearen gako-fitxategia</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - plataforma anitzeko pasahitz kudeatzailea</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2325,60 +3796,32 @@ give it a unique name to identify and accept it.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Zerrendatu datu-baseko sarrerak.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - plataforma anitzeko pasahitz kudeatzailea</translation>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>filenames of the password databases to open (*.kdbx)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
+        <source>path to a custom config file</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge two databases.</source>
-        <translation>Bateratu bi datu-base.</translation>
+        <source>key file of the database</source>
+        <translation>datu-basearen gako-fitxategia</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
+        <source>read password of the database from stdin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Erabili pasahitz bera bi datu-base fitxategietarako.</translation>
-    </message>
-    <message>
-        <source>Show a password.</source>
-        <translation>Erakutsi pasahitz bat.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to show.</source>
-        <translation>Erakutsiko den sarreraren izena.</translation>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_fi.ts b/share/translations/keepassx_fi.ts
index c7d61473e..cfff0d35a 100644
--- a/share/translations/keepassx_fi.ts
+++ b/share/translations/keepassx_fi.ts
@@ -10,14 +10,34 @@
         <translation>Tietoja</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Ilmoita ongelmista: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC:tä jaellaan GPL-lisenssin (GNU General Public License) version 2 tai (valintasi mukaan) version 3 ehtojen mukaisesti.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Projektin ylläpitäjät:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Osallistujat</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Katso osallistujat GitHubista&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Vianjäljitystiedot</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Sisällytä seuraavat tiedot aina kun ilmoitat ongelmasta:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Kopioi leikepöydälle</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revisio: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Jakelu: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Kirjastot:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Käytössä olevat laajennukset:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Ilmoita ongelmista: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC:tä jaellaan GPL-lisenssin (GNU General Public License) version 2 tai (valintasi mukaan) version 3 ehtojen mukaisesti.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Projektin ylläpitäjät:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Katso osallistujat GitHubista&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Sisällytä seuraavat tiedot aina kun ilmoitat ongelmasta:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP - Vahvista pääsy</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Muista tämä valinta</translation>
     </message>
@@ -89,12 +93,15 @@ Kernel: %3 %4</translation>
     <message>
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation>%1 pyytää pääsyä seuraavien alkioiden salasanoihin.
-Ole hyvä ja valitse sallitaanko pääsy.</translation>
+        <translation>%1 pyytää pääsyä seuraavien kohteiden salasanoihin.
+Valitse sallitaanko pääsy.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP - Vahvista pääsy</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Käytä SSH-agenttia (vaatii uudelleenkäynnistyksen)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Automaattitäydennys - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automaattitäydennys</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,290 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Automaattitäydennys - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Valitse merkintä automaattitäydennystä varten:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Automaattitäydennys - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser - Vahvista pääsy</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Muista tämä valinta</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Salli</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Estä</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 pyytää pääsyä seuraavien alkioiden salasanoihin.
+Ole hyvä ja valitse sallitaanko pääsy.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogi</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Käytä KeepassXC:n selainintegraatiota</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Yleistä</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Käytä integraatiota seuraaville selaimille:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Näytä &amp;ilmoitus kun tilitietoja pyydetään</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Pyyd&amp;ä tietokannan lukituksen avaamista jos se on lukittu</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>&amp;Paluta vain parhaiten vastaavat tilitiedot</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Järjestä &amp;vastaavat tilitiedot nimen mukaan</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Jä&amp;rjestä vastaavat tilitiedot käyttäjätunnuksen mukaan</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Katkaise yhteys kaikkiin selaimiin</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>Unohda kaikki muistetut &amp;oikeudet</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Lisäasetukset</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>&amp;Älä koskaan kysy ennen pääsyä tilitietoihin</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Älä koskaan k&amp;ysy ennen tilitietojen päivittämistä</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Vain valittu tietokanta tulee olla yhdistetty asiakkaan kanssa.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>%Etsi kaikista avoinna olevista tietokannoista vastaavia tilitietoja</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Selaa...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Varoitus:&lt;/b&gt; Seuraavat valinnat voivat olla vaarallisia!</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Suoritettavat tiedostot (*.exe);;Kaikki tiedostot (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Tallenna ja salli pääsy</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Korvataanko olemassa oleva avain?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Jaettu salausavain samalla nimellä &quot;%1&quot; on jo olemassa.
+Haluatko korvata sen?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Päivitä merkintä</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: tietokanta lukittu!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Aktiivinen tietokanta on lukittu!
+Avaa valittu tietokanta tai valitse toinen avattu tietokanta.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Asetukset eivät ole käytettävissä!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Avaimia ei löytynyt</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Poistettiin avaimet tietokannasta</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Poistetaan talletettuja oikeuksia…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Keskeytä</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Poistetut käyttöoikeudet</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -149,6 +454,10 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>Toista salasana:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Avaintiedosto</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Selaa</translation>
     </message>
@@ -157,6 +466,14 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>Luo</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>&amp;Haaste ja vastaus</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Päivitä</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Avaintiedostot</translation>
     </message>
@@ -177,6 +494,10 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>Valitse avaintiedosto</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Tyhjä salasana</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Haluatko varmasti asettaa tyhjän merkkijonon salasanaksi?</translation>
     </message>
@@ -191,20 +512,15 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Avaintiedosto</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Haaste ja vastaus</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Päivitä</translation>
+        <source>Legacy key file format</source>
+        <translation>Vanha avaintiedostomuoto</translation>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Tyhjä salasana</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +534,10 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>Kopiointiasetukset</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Lisää &apos; - Klooni&apos; otsikkoon</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation type="unfinished"/>
     </message>
@@ -225,10 +545,6 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <source>Copy history</source>
         <translation>Kopiointi historia</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Lisää &apos; - Klooni&apos; otsikkoon</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -325,10 +641,6 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Tuo CSV-tiedosto</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Virhe</translation>
     </message>
@@ -339,17 +651,17 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> tavu, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n tavu.</numerusform><numerusform>%n tavua.</numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>rivit,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n rivi.</numerusform><numerusform>%n riviä.</numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>sarakkeet</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n sarake.</numerusform><numerusform>%n saraketta.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -364,19 +676,42 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
     </message>
     <message>
         <source>Password:</source>
-        <translation>Salasana</translation>
+        <translation>Salasana:</translation>
     </message>
     <message>
         <source>Browse</source>
         <translation>Selaa</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Päivitä</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Haaste/vastaus:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
-        <translation>Tietokannan avaaminen ei onnistunut.</translation>
+        <translation>Tietokannan avaaminen epäonnistui.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Avaintiedostoa ei voitu avata</translation>
+        <translation>Avaintiedoston avaaminen epäonnistui</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Vanha avaintiedostomuoto</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Älä näytä tätä varoitusta uudelleen</translation>
     </message>
     <message>
         <source>All files</source>
@@ -390,14 +725,6 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <source>Select key file</source>
         <translation>Valitse avaintiedosto</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Päivitä</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Haaste/vastaus:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -414,14 +741,14 @@ Ole hyvä ja valitse sallitaanko pääsy.</translation>
         <translation>Avaintiedoston avaaminen epäonnistui</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Tietokannan avaaminen onnistui. Ei tehtävää.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Tietokannan avaaminen epäonnistui.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Tietokannan avaaminen onnistui. Ei tehtävää.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Onnistui!</translation>
     </message>
@@ -439,40 +766,57 @@ Voit nyt tallentaa sen.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Tietokannan nimi:</translation>
+        <source>General</source>
+        <translation>Yleistä</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Tietokannan kuvaus:</translation>
+        <source>Encryption</source>
+        <translation>Salaus</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Muunnoskierroksia:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Oletuskäyttäjänimi:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation>Ymmärrän, säilytä numero</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Suorituskykytesti</translation>
+        <source>Cancel</source>
+        <translation>Peru</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Maks. historia-alkioiden lukumäärä:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Maks. historian koko:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Käytä roskakoria</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Salausalgoritmi:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -483,14 +827,78 @@ Voit nyt tallentaa sen.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmi:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Muunnoskierroksia:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Muistin käyttö:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> Mt</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Tietokannan nimi:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Tietokannan kuvaus:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Oletuskäyttäjänimi:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Historia-asetukset</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Maks. historia-alkioiden lukumäärä:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Maks. historian koko:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Käytä roskakoria</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Juuri</translation>
     </message>
     <message>
@@ -510,22 +918,48 @@ Voit nyt tallentaa sen.</translation>
         <translation>Tiedostoa ei löytynyt!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Avaa KeePass 1 -tietokanta</translation>
+        <source>Unable to open the database.</source>
+        <translation>Tietokannan avaaminen epäonnistui.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 -tietokanta</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Tiedosto on avattu &quot;vain luku&quot;-tilassa.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Avaa CSV-tiedosto</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV-tiedosto</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Kaikki tiedostot(*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Yhdistä tietokanta</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Avaa KeePass 1 -tietokanta</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 -tietokanta</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Sulje?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; on muokkaustilassa.
+Hylkää muutokset ja sulje?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Tallenna muutokset?</translation>
     </message>
@@ -540,10 +974,22 @@ Tallennetaanko muutokset?</translation>
         <translation>Tietokannan kirjoitus levylle epäonnistui.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Salasanat</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Tallenna tietokanta nimellä</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Vie tietokanta CSV-tiedostoon</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>CSV-tiedoston kirjoitus levylle epäonnistui.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Uusi tietokanta</translation>
     </message>
@@ -562,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Paina Peruuta jos haluat viimeistellä muutoksesi, muussa tapauksessa muutoksesi hylätään.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Tätä tietokantaa ei ole koskaan tallennettu.
-Voit tallentaa tietokannan tai lopettaa sen lukituksen.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -575,70 +1015,14 @@ Otherwise your changes are lost.</source>
 Haluatko tallentaa tietokannan ennen sen lukitsemista?
 Jos et tallenna, muutokset hylätään.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; on muokkaustilassa.
-Hylkää muutokset ja sulje?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Vie tietokanta CSV-tiedostoon</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV-tiedosto</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>CSV-tiedoston kirjoitus levylle epäonnistui.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Tietokannan avaaminen ei onnistunut.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Yhdistä tietokanta</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Tietokanta jota yrität avata on avoinna toisessa KeePassXC-ikkunassa.
-Haluatko tallentaa tietokannan siitä huolimatta?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Salasanat</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Tietokanta on jo avattu</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Tietokanta, jota yrität avata, on jo avattu toisessa KeePassXC-instanssissa.
-
-Haluatko avata tietokannan silti?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Avaa &quot;vain luku&quot;-tilassa</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Tiedosto on avattu &quot;vain luku&quot;-tilassa.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Avaa CSV-tiedosto</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Etsitään...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Vaihda pääsalasana</translation>
     </message>
@@ -659,36 +1043,44 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Haluatko varmasti poistaa alkiot %1, lopullisesti?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Siirrä merkintä roskakoriin?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Haluatko varmasti siirtää tietueen &quot;%1&quot; roskakoriin?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Siirrä alkiot roskakoriin?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Haluatko varmasti siirtää %n kappaletta alkioita roskakoriin?</numerusform><numerusform>Haluatko varmasti siirtää %n merkintää roskakoriin?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Poista ryhmä?</translation>
+        <source>Execute command?</source>
+        <translation>Suorita komento?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Haluatko varmasti poistaa ryhmän &quot;%1&quot;, lopullisesti?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Haluatko varmasti suorittaa seuraavan komennon?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Pääavaimen laskeminen ei onnistu</translation>
+        <source>Remember my choice</source>
+        <translation>Muista valintani</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Siirrä merkintä roskakoriin?</translation>
+        <source>Delete group?</source>
+        <translation>Poista ryhmä?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Haluatko varmasti siirtää tietueen &quot;%1&quot; roskakoriin?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Haluatko varmasti poistaa ryhmän &quot;%1&quot;, lopullisesti?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Etsitään...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Pääavaimen laskeminen ei onnistu</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1099,8 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Ei tuloksia.</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Suorita komento?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Haluatko varmasti suorittaa seuraavan komennon?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Muista valintani</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Automaattilatauksen pyyntö</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1111,10 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Yhdistämispyyntö</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Tietokantatiedosto on muuttunut ja sinulla on tallentamattomia muutoksia. Haluatko yhdistää tekemäsi muutokset?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>Tietokantatiedosto on muuttunut, ja sinulla on tallentamattomia muutoksia.
+Haluatko yhdistää muutoksesi?</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1130,89 @@ Haluatko avata tietokannan silti?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sulje</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Yleistä</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Käyttäjätunnus</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Liitteet</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Ikkuna</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekvenssi</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Etsi</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Tyhjennä</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Ei koskaan</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[SUOJATTU]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Pois käytöstä</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Käytössä</translation>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1239,30 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Historia</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH-agentti</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(salattu)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Valitse yksityinen avain</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Tiedosto on liian suuri ollakseen yksityinen avain</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Yksityisen avaimen avaaminen epäonnistui</translation>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Alkioiden historia</translation>
     </message>
@@ -794,22 +1283,20 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Uusi attribuutti</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Valitse tiedosto</translation>
+        <source>Confirm Remove</source>
+        <translation>Vahvista poisto</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Tiedoston avaus ei onnistu</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Haluatko varmasti poistaa tämän attribuutin?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Tallenna liite</translation>
+        <source>[PROTECTED]</source>
+        <translation>[SUOJATTU]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Liitteen tallentaminen ei onnistu:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1304,16 @@ Haluatko avata tietokannan silti?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n viikkoa</numerusform><numerusform>%n viikkoa</numerusform></translation>
+        <translation><numerusform>%n viikko</numerusform><numerusform>%n viikkoa</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n kuukautta</numerusform><numerusform>%n kuukautta</numerusform></translation>
+        <translation><numerusform>%n kuukausi</numerusform><numerusform>%n kuukautta</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 vuosi</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Vahvista poisto</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Haluatko varmasti poistaa tämän attribuutin?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Haluatko varmasti poistaa tämän liitteen?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1330,6 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Poista</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Liitteet</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Tallenna</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Avaa</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Muokkaa nimeä</translation>
     </message>
@@ -882,6 +1341,10 @@ Haluatko avata tietokannan silti?</translation>
         <source>Reveal</source>
         <translation>Paljasta</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Liitteet</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1353,18 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Salli automaattitäydennys tälle merkinnälle</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Peri automaattitäydennyksen oletussekvenssi &amp;ryhmältä</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,24 +1377,12 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Ikkunan otsikko:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Peri automaattitäydennyksen oletussekvenssi &amp;ryhmältä</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
-        <translation type="unfinished"/>
+        <translation>Käytä oletuss&amp;ekvenssiä</translation>
     </message>
     <message>
         <source>Set custo&amp;m sequence:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Window Associations</source>
-        <translation type="unfinished"/>
+        <translation>Aseta mukautettu se&amp;kvenssi:</translation>
     </message>
 </context>
 <context>
@@ -944,12 +1407,8 @@ Haluatko avata tietokannan silti?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Otsikko:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Käyttäjänimi</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1419,104 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Toista:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Otsikko:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Erääntyy</translation>
+        <source>Notes</source>
+        <translation>Muistiinpanot</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Esiasetus</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Muistiinpanot:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Käyttäjänimi</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Erääntyy</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Poista avain agentilta viiveellä</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>s</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Sormenjälki</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>Poista avain agentista kun tietokanta on suljettu/lukittu</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Julkinen avain</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Lisää avain agenttiin kun tietokanta on avattu/lukitus avattu</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Kommentti</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Kopioi leikepöydälle</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Yksityinen avain</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Ulkoinen tiedosto</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Selaa...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Liite</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Lisää agenttiin</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Poista agentista</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Vaadi käyttäjävahvistusta kun avainta käytetään</translation>
     </message>
 </context>
 <context>
@@ -1045,6 +1588,14 @@ Haluatko avata tietokannan silti?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Käytä oletuskuvaketta</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Kä&amp;ytä mukautettua kuvaketta</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Lisää mukautettu kuvake</translation>
     </message>
@@ -1053,6 +1604,18 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Poista mukautettu kuvake</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Lataa favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Faviconin noutaminen ei onnistu</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Vinkki: voit asettaa Googlen varajärjestelmäksi kohdassa Työkalut &gt; Asetukset &gt; Turvallisuus</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Kuvat</translation>
     </message>
@@ -1065,24 +1628,12 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Valitse kuva</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Lataa favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Faviconin noutaminen ei onnistu</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Kuvaketta ei voida lukea</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Käytä oletuskuvaketta</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Kä&amp;ytä mukautettua kuvaketta</translation>
+        <source>Custom icon already exists</source>
+        <translation>Mukautettu kuvake on jo olemassa</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1643,6 @@ Haluatko avata tietokannan silti?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Tämä kuvake on %1 tietueen käytössä, ja se korvataan oletuskuvakkeella. Haluatko varmasti poistaa tämän kuvakkeen?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Vinkki: voit asettaa Googlen varajärjestelmäksi kohdassa Työkalut &gt; Asetukset &gt; Turvallisuus</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1667,99 @@ Haluatko avata tietokannan silti?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Klooni</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nimi</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Koko</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Lisää</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Poista</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Avaa</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Tallenna</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Valitse tiedostot</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Vahvista poisto</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Tallenna liitteet</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Hakemiston luominen epäonnistui:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Vahvista korvaaminen</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Liitteiden tallentaminen epäonnistui:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Liitteen avaaminen epäonnistui:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Liitteiden avaaminen epäonnistui:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>Tiedostojen avaaminen epäonnistui:
+%1</translation>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1788,11 @@ Haluatko avata tietokannan silti?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Ryhmä</translation>
     </message>
@@ -1171,11 +1808,6 @@ Haluatko avata tietokannan silti?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1817,17 @@ Haluatko avata tietokannan silti?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Tiedostoa ei voi tallentaa!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1890,358 @@ Haluatko avata tietokannan silti?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Pääavaimen laskeminen ei onnistu</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Haaste-vastauksen tekeminen epäonnistui.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Väärä avain tai tietokanta on korruptoitunut.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Haaste-vastauksen tekeminen epäonnistui.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Pääavaimen laskeminen ei onnistu</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Pääavaimen laskeminen ei onnistu</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Väärä avain tai tietokantatiedosto on rikki. (HMAC ei täsmää)</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Pääavaimen laskeminen ei onnistu</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Ei-tuettu pakkausalgoritmi</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Tiedosto ei ole KeePass-tietokanta</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>Ei-tuettu KeePass 2 -tietokantaversio.</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>XML-jäsentämisen virhe: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>Virheellinen EnableAutoType-arvo</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation>Virheellinen EnableSearching-arvo</translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>Ryhmän uuid:tä ei löydy</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Virheellinen väriarvo</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>Virheellinen numeroarvo</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>Virheellinen uuid-arvo</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1254,7 +2249,7 @@ Haluatko avata tietokannan silti?</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Tietokannan avaaminen ei onnistunut.</translation>
+        <translation>Tietokannan avaaminen epäonnistui.</translation>
     </message>
 </context>
 <context>
@@ -1276,6 +2271,35 @@ Haluatko avata tietokannan silti?</translation>
         <translation>Tukematon KeePass-tietokantaversio</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Juuri</translation>
     </message>
@@ -1287,126 +2311,141 @@ Haluatko avata tietokannan silti?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Väärä avain tai tietokanta on korruptoitunut.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Tiedosto ei ole KeePass-tietokanta</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Tukematon KeePass-tietokantaversio</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Väärä avain tai tietokanta on korruptoitunut.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Pääavaimen laskeminen ei onnistu</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <source>Incorrect group creation time field size</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Pääavaimen laskeminen ei onnistu</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
+        <source>Incorrect group expiry time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Virhe</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Incorrect group level field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Toinen KeePassXC-instanssi on jo käynnissä.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Avaa tietokanta</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Tietokannan asetukset</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Kopioi käyttäjätunnus leikepöydälle</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Kopioi salasana leikepöydälle</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Näytä työkalupalkki</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>vain-luku</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>Invalid entry modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Keepass 2 -tietokanta</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Kaikki tiedostot</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Tallenna korjattu tietokanta</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Tietokannan kirjoitus levylle epäonnistui.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Toinen KeePassXC-instanssi on jo käynnissä.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Virhe</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Tietokanta</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>Viimeisimmät tietokannat</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Tuo</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Ohje</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Ti&amp;etueet</translation>
     </message>
@@ -1415,12 +2454,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopioi att&amp;ribuutti leikepöydälle</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>Ryhmät</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>Näkymä</translation>
+        <source>&amp;Tools</source>
+        <translation>T&amp;yökalut</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1431,6 +2474,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Tietoja</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Avaa tietokanta...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Tallenna tietokanta</translation>
     </message>
@@ -1471,24 +2518,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Poista ryhmä</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Tietokannan asetukset</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Ta&amp;llenna tietokanta nimellä...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>Kloonaa merkintä</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Vaih&amp;da pääsalasana...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Ajastettu kertakäyttöinen salasana (TOTP)</translation>
+        <source>&amp;Database settings</source>
+        <translation>Tietokannan asetukset</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Kopioi &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Tietokannan asetukset</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Näytä TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Kloonaa merkintä</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1499,14 +2546,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopioi käyttäjätunnus</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Kopioi käyttäjätunnus leikepöydälle</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Kopioi salasana</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Kopioi salasana leikepöydälle</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Salasanageneraattori</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>Suorita automaattitäydennys</translation>
     </message>
@@ -1523,165 +2582,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Otsikko</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Kopioi osoite leikepöydälle</translation>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Salasanageneraattori</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Tyhjennä historia</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Vie CSV-tiedostoon...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Tietokanta</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Tuo KeePass 1 -tietokanta...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Tuo</translation>
+        <source>Import CSV file...</source>
+        <translation>Tuo CSV-tiedosto...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>T&amp;yökalut</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Ko&amp;rjaa tietokanta...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Näytä TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Aseta TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Kopioi &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>&amp;Tyhjennä roskakori</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Tyhjennä roskakori</translation>
+        <source>Clear history</source>
+        <translation>Tyhjennä historia</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Pääsyvirhe asetustiedostoon %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Sulje KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Kosketa YubiKeyssa olevaa painiketta!</translation>
+        <source>read-only</source>
+        <translation>vain-luku</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Ohje</translation>
+        <source>Settings</source>
+        <translation>Asetukset</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Avaa tietokanta...</translation>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Ta&amp;llenna tietokanta nimellä...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Sulje KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Vaih&amp;da pääsalasana...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 -tietokanta</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Vie CSV-tiedostoon...</translation>
+        <source>All files</source>
+        <translation>Kaikki tiedostot</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Tuo KeePass 1 -tietokanta...</translation>
+        <source>Open database</source>
+        <translation>Avaa tietokanta</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Tuo CSV-tiedosto...</translation>
+        <source>Save repaired database</source>
+        <translation>Tallenna korjattu tietokanta</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Ko&amp;rjaa tietokanta...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Tietokannan kirjoitus levylle epäonnistui.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Aseta TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Kosketa YubiKeyssa olevaa painiketta!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialogi</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Virheellinen avaintiedosto, odotetaan OpenSSH-avainta</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Yleistä</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Nä&amp;ytä ilmoitus kun tilitietoja pyydetään</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key file way too small.</source>
+        <translation>Avaintiedosto aivan liian pieni.</translation>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Lisää..</translation>
+        <source>Found zero keys</source>
+        <translation>Löytyi nolla avainta</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Salli aina &amp;pääsy tietueisiin</translation>
+        <source>Failed to read public key.</source>
+        <translation>Julkisen avaimen lukeminen epäonnistui.</translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Salli aina tietueiden p&amp;äivittäminen</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Rikkinäinen avaintiedosto, yksityisen avaimen lukeminen epäonnistui</translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>E&amp;tsi kaikista avatuista tietokannoista vastaavia tietueita</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-portti:</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Oletusportti: 19455</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Pyyd&amp;ä tietokannan lukituksen avaamista jos se on lukittu</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Key derivation failed, key file corrupted?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC kuuntelee tätä porttia osoitteessa 127.0.0.1</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Ei voida sitoutua etuoikeutettuihin portteihin</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Ei voida sitoutua etuoikeutettuihin portteihin, jotka ovat alle 1024!
-Käytetään oletusporttia 19455.</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>Odottamaton EOF julkista avainta luettaessa</translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Poista kaikki jaetut salausavaimet aktiivisesta tietokannasta</translation>
+        <source>Unknown key type: </source>
+        <translation>Tuntematon avaintyyppi:</translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation type="unfinished"/>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>Odottamaton EOF yksityistä avainta luettaessa</translation>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation type="unfinished"/>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Ei voida kirjoittaa julkista avainta, koska se on tyhjä</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation>Odottamaton EOF julkista avainta kirjoittaessa</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Ei voida kirjoittaa yksityistä avainta, koska se on tyhjä</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Odottamaton EOF yksityistä avainta kirjoittaessa</translation>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogi</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1692,6 +2796,15 @@ Käytetään oletusporttia 19455.</translation>
         <translation>Ota käyttöön KeePassHTTP-palvelin</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Yleistä</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Nä&amp;ytä ilmoitus kun tilitietoja pyydetään</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"/>
     </message>
@@ -1700,6 +2813,10 @@ Käytetään oletusporttia 19455.</translation>
         <translation>&amp;Palauta vain parhaiten vastaavat tietueet</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Pyyd&amp;ä tietokannan lukituksen avaamista jos se on lukittu</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Vain tietueet samalla skeemalla (http://, https://, ftp://, ...) palautetaan.</translation>
     </message>
@@ -1708,27 +2825,108 @@ Käytetään oletusporttia 19455.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Poista kaikki jaetut salausavaimet aktiivisesta tietokannasta</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Salasanageneraattori</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Lisäasetukset</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Salli aina &amp;pääsy tietueisiin</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Salli aina tietueiden p&amp;äivittäminen</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
+        <translation>Vain valittu tietokanta tulee olla yhdistetty asiakkaan kanssa.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>E&amp;tsi kaikista avatuista tietokannoista vastaavia tietueita</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Seuraavat valinnat voivat olla vaarallisia!
-Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
+        <source>HTTP Port:</source>
+        <translation>HTTP-portti:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Oletusportti: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC kuuntelee tätä porttia osoitteessa 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Varoitus:&lt;/b&gt; Seuraavat valinnat voivat olla vaarallisia!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;KeePassHTTP on vanhennettu ja se poistetaan tulevaisuudessa.&lt;br&gt;Vaihda KeePassXC-Browseriin! Ohjeita siirtymiseen on tarjolla &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;siirtymäohjeessa&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Ei voida sitoutua etuoikeutettuihin portteihin</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Ei voida sitoutua etuoikeutettuihin portteihin, jotka ovat alle 1024!
+Käytetään oletusporttia 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Salasana</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>vahvuus</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Merkkityypit</translation>
     </message>
@@ -1749,38 +2947,50 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
         <translation>Erikoismerkit</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Laajennettu ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Poissulje samannäköiset merkit</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Hyväksy</translation>
+        <source>Pick characters from every group</source>
+        <translation>Poimi merkkejä jokaisesta ryhmästä</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation type="unfinished"/>
+        <source>&amp;Length:</source>
+        <translation>&amp;Pituus:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>vahvuus</translation>
+        <source>Passphrase</source>
+        <translation>Tunnuslause</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropia</translation>
+        <source>Wordlist:</source>
+        <translation>Sanalista:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Pituus:</translation>
+        <source>Word Count:</source>
+        <translation>Sanamäärä:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Poimi merkkejä jokaisesta ryhmästä</translation>
+        <source>Word Separator:</source>
+        <translation>Sanaerotin:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Generoi</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Kopioi</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Hyväksy</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Sulje</translation>
     </message>
@@ -1798,51 +3008,273 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Huono</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Heikko</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Hyvä</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Erinomainen</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Salasana</translation>
+        <source>Database not opened</source>
+        <translation>Tietokanta ei avattu</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Laajennettu ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Tunnuslause</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Sanalista:</translation>
+        <source>Cannot decrypt message</source>
+        <translation>Viestin salauksen purkaminen ei onnistu</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Sanamäärä:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation>Aikakatkaisu tai yhteys KeePassXC:hen ei onnistu</translation>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Sanaerotin:</translation>
+        <source>Action cancelled or denied</source>
+        <translation>Toiminto peruttiin tai estettiin</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopioi</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation>Viestin salauksen purkaminen ei onnistu tai julkista avainta ei löydy. Onko Native Messaging käytössä KeePassXC:ssä?</translation>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation>Avainvaihto ei onnistunut</translation>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>Salausavainta ei tunnistettu</translation>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation>Tallennettuja tietokantoja ei löytynyt</translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation>Virheellinen toiminto</translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation>Vastaanotettiin tyhjä viesti</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Tuntematon virhe</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Tietokannan polku.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>Tietokannan avaintiedosto.</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>polku</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>käyttäjätunnus</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Pura ja tulosta tietokannan sisältö.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Purettavan tietokannan polku.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation>Avaintiedoston %1 lataaminen epäonnistui : %2</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation>
+
+Käytettävissä olevat komennot:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Suoritettavan komennon nimi.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Listaa tietokannan tietueet.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Yhdistä kaksi tietokantaa.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Tietokannan polku, johon yhdistetään.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Tietokannan polku, josta yhdistetään.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Käytä samoja tilitietoja molemmille tietokantatiedostoille.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Näytettävän tietueen nimi.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation type="unfinished"/>
@@ -1866,8 +3298,28 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation type="unfinished"/>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – suositeltu)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1886,14 +3338,22 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
         <translation>Salasana</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Muistiinpanot</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>Viimeksi muokattu</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Luotu</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Selainintegraatio</translation>
     </message>
@@ -1909,6 +3369,10 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
         <source>Passive</source>
         <translation>Passiivi</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH-agentti</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1947,8 +3411,8 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Kirjainkoko on merkitsevä</translation>
+        <source>Search...</source>
+        <translation>Etsi...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1959,8 +3423,8 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
         <translation>Tyhjennä</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Etsi...</translation>
+        <source>Case Sensitive</source>
+        <translation>Kirjainkoko on merkitsevä</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1970,49 +3434,6 @@ Muuta niitä vain, jos tiedät mitä olet tekemässä.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Jaettu salausavain nimeltä &quot;%1&quot; on jo olemassa.
-Haluatko korvata sen?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Jaettuja salausavaimia ei löytynyt KeePassHttp-asetuksista.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Keskeytä</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation type="unfinished"/>
     </message>
@@ -2027,33 +3448,77 @@ give it a unique name to identify and accept it.</source>
         <translation>KeePassXC: Korvataanko olemassa oleva avain?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Jaettu salausavain nimeltä &quot;%1&quot; on jo olemassa.
+Haluatko korvata sen?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Päivitä merkintä</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: tietokanta lukittu!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Aktiivinen tietokanta on lukittu!
+Avaa valittu tietokanta tai valitse toinen avattu tietokanta.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Poistettiin avaimet tietokannasta</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Avaimia ei löytynyt</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Jaettuja salausavaimia ei löytynyt KeePassHttp-asetuksista.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Asetukset eivät ole käytettävissä!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Poistetaan talletettuja oikeuksia...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Keskeytä</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Poistetut käyttöoikeudet</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2077,10 +3542,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Perusasetukset</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Käynnistä vain yksi KeePassXC-instanssi</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Muista viimeisimmät tietokannat</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Muista viimeisimmät avaintiedostot ja tietoturva-avainlaitteet (donglet)</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Lataa edelliset tietokannat käynnistäessä</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Tallenna automaattisesti suljettaessa</translation>
     </message>
@@ -2089,20 +3570,28 @@ give it a unique name to identify and accept it.</source>
         <translation>Tallenna automaattisesti jokaisen muutoksen jälkeen</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Lataa tietokanta automaattisesti uudelleen jos tietokantaa muokattiin muualla</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Pienennä ikkuna kopioidessa leikepöydälle</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Pienennä ikkuna ohjelman käynnistyessä</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Käytä ryhmän kuvaketta merkintää luodessa</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globaalin automaattitäydennyksen pikanäppäin</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Kieli</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2113,39 +3602,27 @@ give it a unique name to identify and accept it.</source>
         <translation>Piiloita pienennetty ikkuna ilmoitusalueelle</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Lataa edelliset tietokannat käynnistäessä</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Lataa tietokanta automaattisesti uudelleen jos tietokantaa muokattiin muualla</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Piiloita ikkuna ilmoitusalueelle sulkemisen sijaan</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Pienennä ikkuna ohjelman käynnistyessä</translation>
+        <source>Dark system tray icon</source>
+        <translation>Tumma ilmoitusalueen kuvake</translation>
     </message>
     <message>
-        <source>Basic Settings</source>
-        <translation>Perusasetukset</translation>
+        <source>Language</source>
+        <translation>Kieli</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Muista viimeisimmät avaintiedostot ja tietoturva-avainlaitteet (donglet)</translation>
+        <source>Auto-Type</source>
+        <translation>Automaattitäydennys</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Automaattitäydennys</translation>
-    </message>
-    <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2153,26 +3630,32 @@ give it a unique name to identify and accept it.</source>
         <translation>Kysy aina ennen automaattitäydennyksen käyttämistä</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globaalin automaattitäydennyksen pikanäppäin</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Automaattitäydennyksen viive</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Käynnistä vain yksi KeePassXC-instanssi</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Aikakatkaisut</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Tyhjennä leikepöytä kun on kulunut</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>s.</translation>
     </message>
     <message>
@@ -2180,8 +3663,12 @@ give it a unique name to identify and accept it.</source>
         <translation>Lukitse tietokannat jos on oltu joutilaana</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Näytä salasanat oletuksena selkokielisenä</translation>
+        <source>Convenience</source>
+        <translation>Mukavuus</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Lukitse tietokannat kun istunto lukitaan tai kansi suljetaan</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2192,16 +3679,16 @@ give it a unique name to identify and accept it.</source>
         <translation>Älä vaadi salasanan toistoa jos salasana on näkyvillä</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Aikakatkaisut</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Näytä salasanat oletuksena selkokielisenä</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Mukavuus</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Lukitse tietokannat kun istunto lukitaan tai kansi suljetaan</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2223,6 +3710,14 @@ give it a unique name to identify and accept it.</source>
         <translation>Avain:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Käytä mukautettuja asetuksia</translation>
     </message>
@@ -2248,6 +3743,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>s.</translation>
     </message>
 </context>
@@ -2315,88 +3811,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>polku mukautettuun asetustiedostoon</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>tietokannan avaintiedosto</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - järjestelmäriippumaton salasanojen hallintasovellus</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>lue tietokannan salasana stdin:istä</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Kopioi salasana leikepöydälle</translation>
-    </message>
-    <message>
         <source>Path of the database.</source>
         <translation>Tietokannan polku.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Name of the entry to clip.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - järjestelmäriippumaton salasanojen hallintasovellus</translation>
     </message>
     <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Pura ja tulosta tietokannan sisältö.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>avattavien salasanatietokantojen tiedostonimet (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
-        <translation>Purettavan tietokannan polku.</translation>
+        <source>path to a custom config file</source>
+        <translation>polku mukautettuun asetustiedostoon</translation>
     </message>
     <message>
-        <source>Name of the command to execute.</source>
-        <translation>Suoritettavan komennon nimi.</translation>
+        <source>key file of the database</source>
+        <translation>tietokannan avaintiedosto</translation>
     </message>
     <message>
-        <source>List database entries.</source>
-        <translation>Listaa tietokannan tietueet.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>lue tietokannan salasana stdin:istä</translation>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Tulosat tietueiden ja ryhmien UUID:t.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Yhdistä kaksi tietokantaa.</translation>
-    </message>
-    <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Tietokannan polku, johon yhdistetään.</translation>
-    </message>
-    <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Tietokannan polku, josta yhdistetään.</translation>
-    </message>
-    <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Käytä samaa salasanaa molemmille tietokantatiedostoille.</translation>
-    </message>
-    <message>
-        <source>Show a password.</source>
-        <translation>Näytä salasana.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to show.</source>
-        <translation>Näytettävän tietueen nimi.</translation>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_fr.ts b/share/translations/keepassx_fr.ts
index f3fa01920..ece9cd5b0 100644
--- a/share/translations/keepassx_fr.ts
+++ b/share/translations/keepassx_fr.ts
@@ -10,14 +10,34 @@
         <translation>À propos</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Signaler les bugs sur : &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC est distribué suivant les termes de la GNU Licence Publique Générale (GNU GPL) version 2 ou version 3 de la licence (à votre choix).</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Mainteneurs du projet :</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Contributeurs</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Voir Contributions sur GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Informations de débogage</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Inclure l&apos;information suivante lorsque vous signaler un bug :</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Copier dans le presse-papier</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Révision : %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribution : %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Bibliothèques :</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel : %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Extensions activées :</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Signaler les bugs sur : &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC est distribué suivant les termes de la GNU Licence Publique Générale (GNU GPL) version 2 ou version 3 de la licence (à votre choix).</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Mainteneurs du projet :</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Voir Contributions sur GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Inclure l&apos;information suivante lorsque vous signaler un bug :</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribution : %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Accès KeePassXC HTTP confirmé</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Se souvenir de ce choix</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 a demandé l’accès aux mots de passe pour l&apos;élément suivant (ou les éléments suivants).
 Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Accès KeePassXC HTTP confirmé</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Activer l&apos;agent SSH (redémarrage nécessaire)</translation>
     </message>
 </context>
 <context>
@@ -105,7 +112,27 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Remplissage automatique - KeePassXC</translation>
+        <translation> Remplissage automatique - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Saisie-Automatique</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>La syntaxe de votre séquence de saisie automatique est incorrecte.</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Cette commande de saisie automatique contient un délai très long. Êtes-vous sûr ?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Cette commande de saisie automatique contient des touches très lentes. Êtes-vous sûr?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Cette commande de saisie automatique contient des arguments souvent répétés. Êtes-vous sûr ?</translation>
     </message>
 </context>
 <context>
@@ -126,12 +153,289 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation> Remplissage automatique - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Choisissez un champ pour Auto-Type :</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC - Navigateur Confirmer l’accès</translation>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation> Remplissage automatique - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Se souvenir de ce choix</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Autoriser</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Refuser</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 a demandé l’accès aux mots de passe pour l&apos;élément suivant (ou les éléments suivants).
+Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogue</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Activer l&apos;intégration KeepassXC au navigateur</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Activer l&apos;intégration avec ces navigateurs:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Demander de déverrouiller la base de données lorsque celle-ci est verrouillée</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Seules les entrées avec le même schéma (http://, https://, ...) sont retournées.</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Renvoie seulement les meilleures correspondances pour une URL spécifique au lieu des entrées pour tout le domaine.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avancé</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Seule la base de données sélectionnée doit être connectée avec un client.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>La création ou la mise a jour automatique ne sont pas pris en charge pour les champs de chaines de caractères !</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp; Retourne les champs avancés de type chaîne qui commencent par &quot;KPH :&quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Explorer...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Configurer manuellement un proxy</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC : nouvelle demande d&apos;association</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC : Écraser la clé existante ?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC : Mettre à jour l&apos;entrée</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Voulez-vous mettre à jour l&apos;information dans %1 - %2 ?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC : Base de données verrouillée !</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>La base de données actuelle est verrouillée !
+Veuillez déverrouiller la base de données sélectionnée ou en choisir une qui est déverrouillée. </translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Paramètre indisponible !</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC : Aucune clé trouvée</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC : Les clés ont été effacées de la base de donnée</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Effacement des permissions enregistrées...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC : Permissions retirées</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC : Aucune entrée avec permissions trouvée !</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de données actuelle ne contient pas d&apos;entrée avec des permissions.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Confirmez le mot de passe :</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Fichier-clé</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Naviguer</translation>
     </message>
@@ -157,6 +465,14 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Créer</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Cha&amp;llenge-réponse</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Rafraîchir</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Fichiers-clés</translation>
     </message>
@@ -177,6 +493,10 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Choisir un fichier-clé</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Mot de passe vide</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Voulez-vous vraiment utiliser une chaîne vide comme mot de passe ?</translation>
     </message>
@@ -191,20 +511,15 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Fichier-clé</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Cha&amp;llenge-réponse</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Rafraîchir</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Mot de passe vide</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Options de clonage</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Ajouter &apos; - Clone&apos; au titre</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Remplacer le nom d&apos;utilisateur et le mot de passe par des références</translation>
     </message>
@@ -225,10 +544,6 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <source>Copy history</source>
         <translation>Copie de l&apos;historique</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Ajouter &apos; - Clone&apos; au titre</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importer un fichier CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Erreur</translation>
     </message>
@@ -340,17 +651,17 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>octet,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>lignes,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>colonnes</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Naviguer</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Rafraîchir</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Challenge-réponse :</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Impossible d&apos;ouvrir la base de données.</translation>
     </message>
@@ -380,6 +699,21 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Impossible d&apos;ouvrir le fichier-clé</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Tous les fichiers</translation>
     </message>
@@ -391,14 +725,6 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <source>Select key file</source>
         <translation>Choisissez un fichier-clé</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Rafraîchir</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Challenge-réponse :</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Veuillez sélectionner si vous souhaitez autoriser l’accès.</translation>
         <translation>Impossible d&apos;ouvrir le fichier-clé</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>La base de données s&apos;est bien ouverte. Aucune action nécéssaire.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Impossible d&apos;ouvrir la base de données.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>La base de données s&apos;est bien ouverte. Aucune action nécéssaire.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Réussite</translation>
     </message>
@@ -440,40 +766,57 @@ Vous pouvez maintenant la sauvegarder.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nom de la base de données :</translation>
+        <source>General</source>
+        <translation>Général</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Description de la base de données :</translation>
+        <source>Encryption</source>
+        <translation>Chiffrement</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Passes de transformation :</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Nom d&apos;utilisateur par défaut :</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Base de référence</translation>
+        <source>Cancel</source>
+        <translation>Annulé</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Nombre max. d&apos;éléments dans l&apos;historique :</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Taille max. de l&apos;historique :</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Utiliser la corbeille</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Algorithme de chiffrement:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ Vous pouvez maintenant la sauvegarder.</translation>
         <translation>Twofish : 256 bits</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algorithme :</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Passes de transformation :</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Utilisation mémoire:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation>Mo</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Métadonnées de la base de données</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nom de la base de données :</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Description de la base de données :</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nom d&apos;utilisateur par défaut :</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Paramètres de l&apos;historique</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Nombre max. d&apos;éléments dans l&apos;historique :</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Taille max. de l&apos;historique :</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Utiliser la corbeille</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Racine</translation>
     </message>
     <message>
@@ -511,22 +918,48 @@ Vous pouvez maintenant la sauvegarder.</translation>
         <translation>Fichier introuvable !</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Ouvrir une base de données KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Impossible d&apos;ouvrir la base de données.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de données Keepass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fichier ouvert en lecture seule.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Ouvrir le fichier CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Fichier CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Tous les fichiers (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Fusionner les bases de données</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Ouvrir une base de données KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de données Keepass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Fermer ?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; est en mode édition.
+Ignorer les changements et fermer ?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Enregistrer les modifications ?</translation>
     </message>
@@ -541,10 +974,22 @@ Enregistrer les modifications ?</translation>
         <translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Mots de passe</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Enregistrer comme nouvelle base de données</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Exporter la base de données au format CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Échec de l&apos;écriture du fichier CSV.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nouvelle base de données</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Cliquez sur Annuler pour finir vos modifications ou abandonnez-les.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Cette base de données n&apos;a pas encore été sauvegardée.
-Vous devez la sauvegarder ou annuler son verrouillage.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,72 +1015,16 @@ Otherwise your changes are lost.</source>
 Voulez-vous l&apos;enregistrer avant de la verrouiller ?
 Autrement, vos modifications seront perdues.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; est en mode édition.
-Ignorer les changements et fermer ?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Exporter la base de données au format CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Fichier CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Échec de l&apos;écriture du fichier CSV.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossible d&apos;ouvrir la base de données.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Fusionner les bases de données</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>La base de données que vous essayez d&apos;enregistrer est verrouillée par une autre instance de KeePassXC.
-Voulez vous l&apos;enregistrer quand même ?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Mots de passe</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>La base de données est déjà ouverte</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>La base de données que vous essayez d&apos;ouvrir est verrouillée par une autre instance de KeePassXC.
-
-Voulez vous l&apos;ouvrir quand même ?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Ouvrir en lecture seule</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fichier ouvert en lecture seule.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Ouvrir le fichier CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Recherche...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
-        <translation>Changer la clé maître</translation>
+        <translation>Modifier la clé maître</translation>
     </message>
     <message>
         <source>Delete entry?</source>
@@ -660,36 +1043,44 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Voulez-vous supprimer &quot;%1&quot; entrées définitivement ?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Déplacer l&apos;entrée dans la corbeille ?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Êtes-vous sûr de vouloir déplacer l&apos;entrée &quot;%1&quot; dans la corbeille ?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Déplacer les entrées vers la corbeille ?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Voulez-vous déplacer %n entrée(s) vers la corbeille ?</numerusform><numerusform>Voulez-vous déplacer %n entrée(s) vers la corbeille ?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Supprimer le groupe ?</translation>
+        <source>Execute command?</source>
+        <translation>Exécuter la commande ?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Voulez-vous supprimer le groupe &quot;%1&quot; définitivement ?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Voulez-vous vraiment exécuter la commande suivante ?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <source>Remember my choice</source>
+        <translation>Se souvenir de mon choix</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Déplacer l&apos;entrée dans la corbeille ?</translation>
+        <source>Delete group?</source>
+        <translation>Supprimer le groupe ?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Êtes-vous sûr de vouloir déplacer l&apos;entrée &quot;%1&quot; dans la corbeille ?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Voulez-vous supprimer le groupe &quot;%1&quot; définitivement ?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Recherche...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Impossible de calculer la clé maître</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -708,20 +1099,8 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Pas de résultats</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Exécuter la commande ?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Voulez-vous vraiment exécuter la commande suivante ?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Se souvenir de mon choix</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Demande de rafraîchissement automatique</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -732,8 +1111,9 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Demande de fusion</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Le fichier de la base de données à changé et vous avez des modification non-enregistrés. Voulez-vous fusionner vos modifications?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -749,6 +1129,89 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fermer</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Recherche...</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Affichage</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notes</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Fenêtre</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Séquence</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Chercher</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Effacer</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -764,7 +1227,7 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Remplissage automatique</translation>
+        <translation>Saisie-Automatique</translation>
     </message>
     <message>
         <source>Properties</source>
@@ -775,6 +1238,30 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Historique</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(chiffré)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Choisir un fichier-clé</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Fichier trop lourd pour être un fichier-clé</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Historique de l&apos;entrée</translation>
     </message>
@@ -788,29 +1275,27 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Les mots de passe ne sont pas identiques.</translation>
+        <translation>Les mots de passe insérés sont différents.</translation>
     </message>
     <message>
         <source>New attribute</source>
         <translation>Nouvel attribut</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Choisissez un fichier</translation>
+        <source>Confirm Remove</source>
+        <translation>Confirmez la suppression</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Impossible d&apos;ouvrir le fichier</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Êtes-vous sûr de vouloir supprimer cet attribut?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Enregistrer le fichier attaché</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Impossible d&apos;enregistrer le fichier attaché :
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -818,32 +1303,16 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semaine(s)</numerusform><numerusform>%n semaine(s)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 an</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmez la suppression</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Êtes-vous sûr de vouloir supprimer cet attribut?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[PROTÉGÉ] Appuyez pour révéler ou éditer</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Êtes-vous sûr de vouloir supprimer cette pièce jointe?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -860,18 +1329,6 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Supprimer</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Affichage</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Enregistrer le fichier</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Ouvrir</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Éditer le nom</translation>
     </message>
@@ -883,6 +1340,10 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <source>Reveal</source>
         <translation>Révéler</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Affichage</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -891,6 +1352,18 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Activer le remplissage automatique pour cette entrée</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Utiliser la séquence de remplissage automatique par défaut du groupe</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Utiliser une séquence de remplissage automatique personnalisée :</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Associations de fenêtre</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -903,14 +1376,6 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Titre de la fenêtre :</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Utiliser la séquence de remplissage automatique par défaut du groupe</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Utiliser une séquence de remplissage automatique personnalisée :</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Utiliser la séquence par défaut</translation>
     </message>
@@ -918,10 +1383,6 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Définir une séquence personnalisée :</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Associations de fenêtre</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -945,12 +1406,8 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Titre :</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nom d&apos;utilisateur :</translation>
+        <source>URL:</source>
+        <translation>URL :</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -961,20 +1418,104 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Confirmation :</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL :</translation>
+        <source>Title:</source>
+        <translation>Titre :</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expiration</translation>
+        <source>Notes</source>
+        <translation>Notes</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Valeurs par défaut</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notes :</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nom d&apos;utilisateur :</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expiration</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>secondes</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Clé publique</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commentaire</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Déchiffré</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copier dans le presse-papier</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Clé privée</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Explorer...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Ajouter à l&apos;agent</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Retirer de l&apos;agent</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1046,6 +1587,14 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>Utiliser l&apos;icône par défaut</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Utiliser une icône personnalisée</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Ajouter une icône personnalisée</translation>
     </message>
@@ -1054,36 +1603,36 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Supprimer une icône personnalisée</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Télécharger la favicône</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Impossible de récupérer la favicône</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Astuce : Vous pouvez activer Google en tant que repli sous Outils&gt;Paramètres&gt;Sécurité</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Images</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Tous les dossiers</translation>
+        <translation>Tous les fichiers</translation>
     </message>
     <message>
         <source>Select Image</source>
         <translation>Choisir une image</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Télécharger la favicône</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Impossible de récupérer la favicône</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Impossible de lire l&apos;icône</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>Utiliser l&apos;icône par défaut</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Utiliser une icône personnalisée</translation>
+        <source>Custom icon already exists</source>
+        <translation>L&apos;icône personnalisée existe déjà</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1093,14 +1642,6 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Cette icône est utilisée par %1 entrée et sera remplacée par l&apos;icône par défaut. Êtes-vous sûr de vouloir l&apos;effacer?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Astuce : Vous pouvez activer Google en tant que repli sous Outils&gt;Paramètres&gt;Sécurité</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>L&apos;icône personnalisée existe déjà</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1125,10 +1666,94 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - Cloner</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nom</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Taille</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Ajouter</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Ouvrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Enregistrer le fichier</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirmez la suppression</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1157,6 +1782,11 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Réf : </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Groupe</translation>
     </message>
@@ -1172,11 +1802,6 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Réf : </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1186,6 +1811,17 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1248,6 +1884,361 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossible de calculer la clé maître</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Impossible de lancer une challenge-réponse.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Clé incorrecte ou la base de données est corrompue.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Impossible de lancer une challenge-réponse.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossible de calculer la clé maître</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossible de calculer la clé maître</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Chiffrement inconnu</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossible de calculer la clé maître</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Ce n&apos;est pas une base de données KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Le fichier sélectionné est une ancienne base de données KeePass 1 (.kdb).
+
+Vous pouvez l&apos;importer en cliquant sur Base de données&gt;&apos;Importer une base de données KeePass 1 ...&apos;
+Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir la base de données importée avec l&apos;ancienne version de KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1277,6 +2268,35 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <translation>Version de base de données KeePass non supportée.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Racine</translation>
     </message>
@@ -1288,129 +2308,141 @@ Voulez vous l&apos;ouvrir quand même ?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Clé incorrecte ou la base de données est corrompue.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Ce n&apos;est pas une base de données KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Version de base de données KeePass non supportée.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Mauvaise clé ou fichier de base de données corrompu.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Impossible de lancer une challenge-réponse.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Le fichier sélectionné est une ancienne base de données KeePass 1 (.kdb).
-
-Vous pouvez l&apos;importer en cliquant sur Base de données&gt;&apos;Importer une base de données KeePass 1 ...&apos;
-Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir la base de données importée avec l&apos;ancienne version de KeePassX 0.4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Impossible de lancer une challenge-réponse.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossible de calculer la clé maître</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Erreur fatale lors des tests des fonctions cryptographiques.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Erreur</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Le fichier verrou ne peut pas être créé. Le mode instance-unique est désactivé.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Une autre instance de KeePassXC est déjà en cours d&apos;exécution.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Le fichier de verrouillage de l’instance unique existant n’est pas valide. Lancement d&apos;une nouvelle instance.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Ouvrir une base de données</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Paramètres de la base de données</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Copier le nom d&apos;utilisateur dans le presse-papier</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Copier le mot de passe dans le presse-papier</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Afficher la barre d&apos;outils</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>Lecture seulement</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Basculer de fenêtre</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de données KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tous les fichiers</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Sauvegarder la base de données réparée</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Le fichier de verrouillage de l’instance unique existant n’est pas valide. Lancement d&apos;une nouvelle instance.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Le fichier verrou ne peut pas être créé. Le mode instance-unique est désactivé.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Une autre instance de KeePassXC est déjà en cours d&apos;exécution.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erreur fatale lors des tests des fonctions cryptographiques.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erreur</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Base de données</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>Bases de données récentes</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importer</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Aide</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Entrées</translation>
     </message>
@@ -1419,12 +2451,16 @@ Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir l
         <translation>Copier l&apos;attribut dans le presse-papier</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>Groupes</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>Affichage</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Outils</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1435,6 +2471,10 @@ Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir l
         <translation>&amp;À propos</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Ouvrir la base de donnée...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Enregistrer la base de données</translation>
     </message>
@@ -1475,24 +2515,24 @@ Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir l
         <translation>&amp;Supprimer le groupe</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Paramètre de la base de &amp;données</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Sau&amp;ver la base de données sous...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>Cloner l&apos;entrée</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Changer la clé &amp;maître...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Mot de passe à usage unique</translation>
+        <source>&amp;Database settings</source>
+        <translation>Paramètre de la base de &amp;données</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Copie &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Paramètres de la base de données</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Afficher TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Cloner l&apos;entrée</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1503,14 +2543,26 @@ Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir l
         <translation>Copier le nom d&apos;utilisateur</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copier le nom d&apos;utilisateur dans le presse-papier</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Copier le mot de passe</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copier le mot de passe dans le presse-papier</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Générateur de mot de passe</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>Exécuter la saisie semi-automatique</translation>
     </message>
@@ -1527,165 +2579,210 @@ Il s&apos;agit d&apos;une migration à sens unique. Vous ne pourrez pas ouvrir l
         <translation>&amp;Titre</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notes</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Générateur de mot de passe</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Effacer l&apos;historique</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exporter dans un fichier CSV...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Base de données</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importer une base de données KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importer</translation>
+        <source>Import CSV file...</source>
+        <translation>Importer un fichier CSV...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Outils</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Ré&amp;parer la base de données...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Afficher TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Configurer TOTP...</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Vider la corbeille</translation>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copie &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Effacer l&apos;historique</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Erreur d&apos;accès au fichier de configuration %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Quitter KeePass XC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Veuillez presser le bouton de votre YubiKey!</translation>
+        <source>read-only</source>
+        <translation>Lecture seulement</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Aide</translation>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Ouvrir la base de donnée...</translation>
+        <source>Toggle window</source>
+        <translation>Basculer de fenêtre</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Sau&amp;ver la base de données sous...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Quitter KeePass XC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Changer la clé &amp;maître...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de données Keepass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exporter dans un fichier CSV...</translation>
+        <source>All files</source>
+        <translation>Tous les fichiers</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importer une base de données KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Ouvrir la base de données</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importer un fichier CSV...</translation>
+        <source>Save repaired database</source>
+        <translation>Sauvegarder la base de données réparée</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Ré&amp;parer la base de données...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Une erreur s&apos;est produite lors de l&apos;écriture de la base de données.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Configurer TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Veuillez presser le bouton de votre YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialogue</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Général</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Montrer une notification quand les références sont demandées</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Trier les entrées correspondantes par nom d&apos;&amp;utilisateur</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Supprimer toutes les permissions enregistrées des entrées de la base de données active</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avancé</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Toujours autoriser l&apos;&amp;accès aux entrées</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Toujours autoriser la mise à jour des entrées</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Cherc&amp;her dans toutes les bases de données ouvertes les entrées correspondantes</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP :</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port par défaut : 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Demander de déverrouiller la base de données lorsque celle-ci est verrouillée</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Trier les entrées correspondantes par titre</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeepassXC va écouter ce port sur 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Liaison impossible avec les ports privilégiés</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Liaison impossible avec les ports privilégiés, ceux avant 1024 !
-Restauration du port 19455 par défaut.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Supprimer toutes les clés de chiffrement partagées de la base de données active</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp; Retourne les champs avancés de type chaîne qui commencent par &quot;KPH :&quot;</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>La création ou la mise a jour automatique ne sont pas pris en charge pour les champs de chaines de caractères !</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogue</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1696,6 +2793,15 @@ Restauration du port 19455 par défaut.</translation>
         <translation>Activer le serveur KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Général</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Montrer une notification quand les références sont demandées</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Renvoie seulement les meilleures correspondances pour une URL spécifique au lieu des entrées pour tout le domaine.</translation>
     </message>
@@ -1704,6 +2810,10 @@ Restauration du port 19455 par défaut.</translation>
         <translation>&amp;Retourner seulement les meilleurs entrées</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Demander de déverrouiller la base de données lorsque celle-ci est verrouillée</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Seules les entrées avec le même schéma (http://, https://, ftp://, ...) sont retournées.</translation>
     </message>
@@ -1712,29 +2822,110 @@ Restauration du port 19455 par défaut.</translation>
         <translation>&amp;Schémas de correspondance URL</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Trier les entrées correspondantes par nom d&apos;&amp;utilisateur</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Trier les entrées correspondantes par titre</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Supprimer toutes les clés de chiffrement partagées de la base de données active</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Supprimer toutes les permissions enregistrées des entrées de la base de données active</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Générateur de mot de passe</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Avancé</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Toujours autoriser l&apos;&amp;accès aux entrées</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Toujours autoriser la mise à jour des entrées</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Seule la base de données sélectionnée doit être connectée avec un client.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Les options suivantes pourraient être dangereuses!
-Ne les changez que si vous savez ce que vous faites.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Cherc&amp;her dans toutes les bases de données ouvertes les entrées correspondantes</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>La création ou la mise a jour automatique ne sont pas pris en charge pour les champs de chaines de caractères !</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp; Retourne les champs avancés de type chaîne qui commencent par &quot;KPH :&quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Port HTTP :</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Port par défaut : 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeepassXC va écouter ce port sur 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Liaison impossible avec les ports privilégiés</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Liaison impossible avec les ports privilégiés, ceux avant 1024 !
+Restauration du port 19455 par défaut.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Mot de passe :</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>force</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropie</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
         <source>Character Types</source>
-        <translation>Types de caractères</translation>
+        <translation>Types de caractères:</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
@@ -1746,45 +2937,57 @@ Ne les changez que si vous savez ce que vous faites.</translation>
     </message>
     <message>
         <source>Numbers</source>
-        <translation>Nombres</translation>
+        <translation>Chiffres</translation>
     </message>
     <message>
         <source>Special Characters</source>
         <translation>Caractères spéciaux</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII étendu</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
-        <translation>Exclure les caractères se ressemblant</translation>
+        <translation>Exclure les caractères qui se ressemblent</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Accepter</translation>
+        <source>Pick characters from every group</source>
+        <translation>Inclure des caractères de chaque groupe</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Longueur :</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>force</translation>
+        <source>Passphrase</source>
+        <translation>Phrase secrète</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropie</translation>
+        <source>Wordlist:</source>
+        <translation>Liste de mots :</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Longueur :</translation>
+        <source>Word Count:</source>
+        <translation>Nombre de mots :</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Inclure des caractères de chaque groupe</translation>
+        <source>Word Separator:</source>
+        <translation>Séparateur de mot :</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Générer</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Copie</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Accepter</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Fermer</translation>
     </message>
@@ -1802,51 +3005,270 @@ Ne les changez que si vous savez ce que vous faites.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Pauvre</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Faible</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Bon</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Excellent</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Mot de passe</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII étendu</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Phrase secrète</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Liste de mots :</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Nombre de mots :</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Séparateur de mot :</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copie</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Chemin d&apos;accès de la base de données.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Extraire et imprimer le contenu d&apos;une base de données.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Chemin de la base de données à extraire.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nom de la commande à exécuter.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Lister les entrées de la base.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Chemin du groupe à lister. Par défaut : /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Fusionner deux bases de données.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Chemin de la base de données cible.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Chemin de la base de données source.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nom de l&apos;entrée à afficher.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Périphérique NULL</translation>
@@ -1870,8 +3292,28 @@ Ne les changez que si vous savez ce que vous faites.</translation>
         <translation>fermeture de citation manquante</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>INTERNE - dépassement de la limite inférieure</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1890,14 +3332,22 @@ Ne les changez que si vous savez ce que vous faites.</translation>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notes</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Intégration Navigateur</translation>
     </message>
@@ -1913,6 +3363,10 @@ Ne les changez que si vous savez ce que vous faites.</translation>
         <source>Passive</source>
         <translation>Passif</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH Agent</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1951,8 +3405,8 @@ Ne les changez que si vous savez ce que vous faites.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Sensible à la casse</translation>
+        <source>Search...</source>
+        <translation>Recherche...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1963,8 +3417,8 @@ Ne les changez que si vous savez ce que vous faites.</translation>
         <translation>Effacer</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Recherche...</translation>
+        <source>Case Sensitive</source>
+        <translation>Sensible à la casse</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1974,50 +3428,6 @@ Ne les changez que si vous savez ce que vous faites.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Une clé de chiffrement partagée avec le nom &quot;%1&quot; existe déjà.
-Voulez-vous l&apos;écraser ?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Voulez-vous mettre à jour l&apos;information dans %1 - %2 ?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>La base de données actuelle est verrouillée !
-Veuillez déverrouiller la base de données sélectionnée ou en choisir une qui est déverrouillée. </translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>%1 %2 de chiffrement ont été retirés avec succès des paramètres de KeePassX/Http.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Aucune clé de chiffrement partagée trouvée dans les paramètres de KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>La base de données actuelle ne contient pas d&apos;entrée de paramètres KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Effacement des permissions enregistrées...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Annuler</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Les permissions de %1 %2 ont été retirées avec succès.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>La base de données actuelle ne contient pas d&apos;entrée avec des permissions.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC : nouvelle demande d&apos;association</translation>
     </message>
@@ -2034,33 +3444,77 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
         <translation>KeePassXC : Écraser la clé existante ?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Une clé de chiffrement partagée avec le nom &quot;%1&quot; existe déjà.
+Voulez-vous l&apos;écraser ?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC : Mettre à jour l&apos;entrée</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Voulez-vous mettre à jour l&apos;information dans %1 - %2 ?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC : Base de données verrouillée !</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>La base de données actuelle est verrouillée !
+Veuillez déverrouiller la base de données sélectionnée ou en choisir une qui est déverrouillée. </translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC : Les clés ont été effacées de la base de donnée</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC : Aucune clé trouvée</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Aucune clé de chiffrement partagée trouvée dans les paramètres de KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Paramètre indisponible !</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>La base de données actuelle ne contient pas d&apos;entrée de paramètres KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Effacement des permissions enregistrées...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC : Permissions retirées</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC : Aucune entrée avec permissions trouvée !</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>La base de données actuelle ne contient pas d&apos;entrée avec des permissions.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2084,10 +3538,26 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Paramètres de base</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Démarrer uniquement une seule instance de KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Se souvenir des dernières bases de données</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Se souvenir des derniers fichiers clé et des dongles de sécurité</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Charger les bases de données précédentes au démarrage</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Sauvegarder automatiquement à la sortie</translation>
     </message>
@@ -2096,20 +3566,28 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
         <translation>Sauvegarder automatiquement après chaque modification</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Recharger automatiquement la base de données quand celle-ci est modifiée depuis l&apos;extérieur</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Réduire lors de la copie dans le presse-papier</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimiser la fenêtre lors du démarrage de l&apos;application</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Utiliser l&apos;icône de groupe à la création d&apos;une entrée</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Raccourci de la Saisie-Automatique</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple : groupes développés)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Langue</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,66 +3598,60 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
         <translation>Réduire la fenêtre vers la zone de notification lors de sa réduction</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Charger les bases de données précédentes au démarrage</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Recharger automatiquement la base de données quand celle-ci est modifiée depuis l&apos;extérieur</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Envoyer la fenêtre dans la zone de notification au lieu de quitter l&apos;application</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimiser la fenêtre lors du démarrage de l&apos;application</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Paramètres de base</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Se souvenir des derniers fichiers clé et des dongles de sécurité</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Ne pas indiquer la base de données comme modifiée pour les changements hors-données (par exemple : groupes développés)</translation>
+        <source>Language</source>
+        <translation>Langue</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Saisie-Automatique</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Utilisez le titre de l&apos;entrée et l&apos;URL dans la correspondance des fenêtres pour la Saisie-Automatique globale.</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Toujours demander avant de procéder à une Saisie-Automatique</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Raccourci de la Saisie-Automatique</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Délais de Remplissage de la Saisie-Automatique</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Démarrer uniquement une seule instance de KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Timeouts</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Vider le presse-papier après</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> s</translation>
     </message>
     <message>
@@ -2187,8 +3659,12 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
         <translation>Verrouiller les bases de données après une inactivité de</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Afficher les mots de passe en clair par défaut</translation>
+        <source>Convenience</source>
+        <translation>Convenance</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Verrouiller les bases de données quand la session est verrouillée ou le capot fermé</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2199,16 +3675,16 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
         <translation>Ne pas demander de répéter le mot de passe lorsque celui-ci est visible</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeouts</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Afficher les mots de passe en clair par défaut</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Convenance</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Verrouiller les bases de données quand la session est verrouillée ou le capot fermé</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2230,6 +3706,14 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
         <translation>Clé :</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Utiliser les paramètres personnalisés</translation>
     </message>
@@ -2255,6 +3739,7 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> s</translation>
     </message>
 </context>
@@ -2322,88 +3807,40 @@ attribuez lui un nom unique pour l&apos;identifier et acceptez la.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>Chemin vers un fichier de configuration personnalisé</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>Fichier-clé de la base de données</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Gestionnaire de mots de passe multiplateforme</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>Lire le mot de passe de la base de données sur l&apos;entrée standard</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>noms de fichiers des bases de données de mot de passe à ouvrir (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Copier un mot de passe dans le presse papier</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Chemin d&apos;accès de la base de données.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Utiliser une invite graphique pour déverrouiller la base de données.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Nom de l&apos;entrée épingler.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Extraire et imprimer le contenu d&apos;une base de données.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
-        <translation>Chemin de la base de données à extraire.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nom de la commande à exécuter.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Lister les entrées de la base.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Chemin du groupe à lister. Par défaut : /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Imprimer les UUIDs des entrées et des groupes.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Fusionner deux bases de données.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Gestionnaire de mots de passe multiplateforme</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Chemin de la base de données cible.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>noms de fichiers des bases de données de mot de passe à ouvrir (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Chemin de la base de données source.</translation>
+        <source>path to a custom config file</source>
+        <translation>Chemin vers un fichier de configuration personnalisé</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Utiliser le même mot de passe pour les deux bases de données. </translation>
+        <source>key file of the database</source>
+        <translation>Fichier-clé de la base de données</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Afficher un mot de passe.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>Lire le mot de passe de la base de données sur l&apos;entrée standard</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nom de l&apos;entrée à afficher.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_hu.ts b/share/translations/keepassx_hu.ts
index dc9877054..033f77ef2 100644
--- a/share/translations/keepassx_hu.ts
+++ b/share/translations/keepassx_hu.ts
@@ -10,14 +10,34 @@
         <translation>Névjegy</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Hibajelentés: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>A KeePassXC a GNU General Public License (GPL) 2. vagy (válaszhatóan ) 3. verziója szerint kerül terjesztésre.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Projektkarbantartók:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Közreműködők</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Közreműködők megtekintése a GitHubon&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Hibakeresési információk</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Minden hibajelentésnél legyenek mellékelve ezek az információk:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Vágólapra másolás</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revízió: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Disztribúció: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Függvénykönyvtárak:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Engedélyezett kiterjesztések:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Hibajelentés: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>A KeePassXC a GNU General Public License (GPL) 2. vagy (válaszhatóan ) 3. verziója szerint kerül terjesztésre.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Projektkarbantartók:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Közreműködők megtekintése a GitHubon&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Minden hibajelentésnél legyenek mellékelve ezek az információk:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Disztribúció: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP hozzáférési engedély</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Döntés megjegyzése</translation>
     </message>
@@ -92,21 +96,44 @@ Please select whether you want to allow access.</source>
         <translation>A %1 jelszóengedélyt kér a következő elem(ek) számára.
 Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP hozzáférési engedély</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>SSH-ügynök engedélyezése (újraindítást igényel)</translation>
     </message>
 </context>
 <context>
     <name>AutoType</name>
     <message>
         <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>Nem található egyetlen elem sem, amely illeszkedik az ablak címsorára:</translation>
+        <translation>Nem található olyan bejegyzés, amely illeszkedik az ablak címsorára:</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
         <translation>Automatikus beírás – KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatikus beírás</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>Az automatikus beírás utasításszintaxisa helytelen!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Ez az automatikus beírás parancs nagyon hosszú késleltetést tartalmaz. Valóban folytatható?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Ez az automatikus beírás parancs nagyon lassú billentyűlenyomásokat tartalmaz. Valóban folytatható?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Ez az automatikus beírás parancs nagyon gyakran ismétlődő paramétert tartalmaz. Valóban folytatható?</translation>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Automatikus beírás – KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Elem kijelölése automatikus beírásra:</translation>
+        <translation>Bejegyzés kijelölése automatikus beírásra:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Automatikus beírás – KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Döntés megjegyzése</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Engedélyezés</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Megtagadás</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>A %1 jelszóengedélyt kér a következő elem(ek) számára.
+Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Párbeszédablak</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>KeepassXC böngészőintegráció engedélyezése</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Általános</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Böngészőintegráció engedélyezése a következőkhöz:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>É&amp;rtesítés megjelenítése hitelesítési adatok kérésekor</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Adatbázis feloldási &amp;kérelem, ha zárolva van</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Csak az azonos sémájú (http://, https://, ...) bejegyzések visszaadása.</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>&amp;URL sémákra illeszkedés (pl. https://...)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Egy konkrét URL-hez tartozó legjobb találatokat adja vissza, a teljes domainhoz tartozó összes bejegyzés helyett.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>Csak a &amp;legjobb hitelesítési adatok visszaadása</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Illeszkedő hitelesítési adatok rendezése &amp;cím szerint</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Illeszkedő hitelesítési adatok rendezése &amp;felhasználónév szerint</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>Minden böngésző &amp;leválasztása</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>Minden tárolt hozzáférés törlése</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Speciális</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Hozzáférési adatok elérése előtt soha ne &amp;kérdezzen</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Hozzáférési adatok &amp;frissítése előtt soha ne kérdezzen</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Csak a kijelölt adatbázishoz kell kapcsolódnia egy klienssel.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>&amp;Keresés minden megnyitott adatbázis hitelesítési adataiban</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>A karakterlánc mezők automatikus létrehozása vagy frissítése nem támogatott.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>A „KPH:”-val kezdődő fejlett karakterlánc mezők &amp;visszaadása</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Új kulcstársítási kérés</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Felülírja a létező kulcsot?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Bejegyzés frissítése</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Frissíti az információt ebben: %1 – %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Adatbázis zárolva!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Az aktív adatbázis zárolt.
+Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell választania.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Nincs ilyen beállítás!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nincs találat a kulcsok között</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Kulcsok eltávolítva az adatbázisból</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Megszakítás</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Jogosultságok eltávolítva</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nem található bejegyzés ilyen jogosultsággal!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Az aktív adatbázisban nincs egyetlen jogosultsági bejegyzés sem.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>Jelszó ismétlése:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Kulcsfájl</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Tallózás</translation>
     </message>
@@ -157,6 +465,14 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>Létrehozás</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Ki&amp;hívás-válasz</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Frissítés</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Kulcsfájlok</translation>
     </message>
@@ -170,15 +486,19 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
     </message>
     <message>
         <source>Unable to create Key File : </source>
-        <translation>Nem hozható létre kulcsfájl:</translation>
+        <translation>Nem hozható létre kulcsfájl: </translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation>Kulcsfájl kijelölése</translation>
+        <translation>Kulcsfájl kiválasztása</translation>
+    </message>
+    <message>
+        <source>Empty password</source>
+        <translation>Üres jelszó</translation>
     </message>
     <message>
         <source>Do you really want to use an empty string as password?</source>
-        <translation>Valóban üres legyen a jelszó?</translation>
+        <translation>Valóban üres szöveget szeretne használni jelszóként?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -187,24 +507,19 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
     <message>
         <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation>A(z) %1 kulcsfájl beállítása meghiúsult:
+        <translation>A(z) %1 kulcsfájl beállítása sikertelen:
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Kulcsfájl</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Ki&amp;hívás-válasz</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Frissítés</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Üres jelszó</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>Beállítások klónozása</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>„- klón” hozzáfűzése a címhez</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>A felhasználónév és a jelszó cseréje hivatkozásokra</translation>
     </message>
@@ -225,10 +544,6 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <source>Copy history</source>
         <translation>Előzmények másolása</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>„- klón” hozzáfűzése a címhez</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>CSV-fájl importálása</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Hiba</translation>
     </message>
@@ -340,17 +651,17 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>bájt,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>sor,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>oszlop</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>Tallózás</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Frissítés</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Kihívás-válasz:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Nem lehet megnyitni az adatbázist.</translation>
     </message>
@@ -380,6 +699,21 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
         <translation>Nem lehet megnyitni a kulcsfájlt</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Minden fájl</translation>
     </message>
@@ -389,15 +723,7 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
     </message>
     <message>
         <source>Select key file</source>
-        <translation>Kulcsfájl kijelölése</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Frissítés</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Kihívás-válasz:</translation>
+        <translation>Kulcsfájl kiválasztása</translation>
     </message>
 </context>
 <context>
@@ -412,25 +738,25 @@ Válassza ki, hogy engedélyezi-e a hozzáférést.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Nem lehet megnyitni a kulcsfájl</translation>
-    </message>
-    <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Az adatbázis megnyitása sikeres. Nincs további teendő.</translation>
+        <translation>Nem lehet megnyitni a kulcsfájlt</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
         <translation>Nem lehet megnyitni az adatbázist.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Az adatbázis megnyitása sikeres. Nincs további teendő.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Sikeres</translation>
     </message>
     <message>
         <source>The database has been successfully repaired
 You can now save it.</source>
-        <translation>Az adatbázis sikeresen helyre lett állítva.
-El lehet menteni.</translation>
+        <translation>Az adatbázis sikeresen meg lett javítva.
+Most már el lehet menteni.</translation>
     </message>
     <message>
         <source>Unable to repair the database.</source>
@@ -440,40 +766,57 @@ El lehet menteni.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Adatbázisnév:</translation>
+        <source>General</source>
+        <translation>Általános</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Adatbázis leírása:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Átalakítási körök száma:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Alapértelmezett felhasználónév:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Teljesítménymérés</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Előzmények max. száma:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Előzmények max. mérete:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Kuka használata</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ El lehet menteni.</translation>
         <translation>Twofish:  256 bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmus:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Átalakítási körök száma:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Adatbázisnév:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Adatbázis leírása:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Alapértelmezett felhasználónév:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Előzmények legnagyobb száma:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Előzmények legnagyobb mérete:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Kuka használata</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Gyökér</translation>
     </message>
     <message>
@@ -511,40 +918,78 @@ El lehet menteni.</translation>
         <translation>A fájl nem található!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 adatbázis megnyitása</translation>
+        <source>Unable to open the database.</source>
+        <translation>Nem lehet megnyitni az adatbázist.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 adatbázis</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Fájl megnyitva csak olvashatóként</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>CSV-fájl megnyitása</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV-fájl</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Minden fájl (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Adatbázis összeolvasztása</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 adatbázis megnyitása</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 adatbázis</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Bezárja?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>A(z) „%1” szerkesztési módban van.
+Elveti a módosításokat és mindenképp bezárja? </translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Menti a módosításokat?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
 Save changes?</source>
-        <translation>„%1” módosítva lett.
-El legyen mentve?</translation>
+        <translation>A(z) „%1” módosítva lett.
+Menti a módosításokat?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>Az adatbázis mentése sikertelen.</translation>
+        <translation>Az adatbázis kiírása sikertelen.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Jelszavak</translation>
     </message>
     <message>
         <source>Save database as</source>
         <translation>Adatbázis mentése más néven</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Adatbázis exportálása CSV-fájlba</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>A CSV-fájl mentése sikertelen.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Új adatbázis</translation>
     </message>
@@ -559,86 +1004,25 @@ El legyen mentve?</translation>
     <message>
         <source>Can't lock the database as you are currently editing it.
 Please press cancel to finish your changes or discard them.</source>
-        <translation>Szerkesztés közben nem lehet zárolni az adatbázist.
-A „Mégse” gombbal befejezhető vagy elvethető a módosítás.</translation>
-    </message>
-    <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Ez az adatbázis még soha nem lett elmentve.
-Elmentheti az adatbázist vagy leállíthatja a zárolást.</translation>
+        <translation>Nem lehet zárolni az adatbázist, mivel jelenleg azt szerkeszti.
+Nyomja meg a „Mégse” gombot a módosítások befejezéshez vagy dobja el azokat.</translation>
     </message>
     <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
         <translation>Ez az adatbázis módosítva lett.
-Elmenti az adatbázist a zárolás előtt?
+Szeretné elmenteni az adatbázist zárolás előtt?
 Különben a módosítások elvesznek.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>„%1” szerkesztési módban van.
-Elveti a módosításokat és mindenképp bezárja? </translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Adatbázis exportálása CSV-fájlba</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV-fájl</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>A CSV-fájl mentése sikertelen.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Nem lehet megnyitni az adatbázist.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Adatbázis összeolvasztása</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>A mentés alatt álló adatbázist egy másik KeePassXC példány zárolta.
-Mindenképp elmenti?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Jelszavak</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Az adatbázis már meg lett nyitva</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>A megnyitás alatt álló adatbázist egy másik KeePassXC példány zárolta.
-Mindenképp megnyitja?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Megnyitás csak olvashatóként</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Fájl megnyitva csak olvashatóként</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>CSV-fájl megnyitása</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Keresés…</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Mesterkulcs módosítása</translation>
     </message>
@@ -648,7 +1032,7 @@ Mindenképp megnyitja?</translation>
     </message>
     <message>
         <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>Valóban végleg törli a bejegyzést: „%1”?</translation>
+        <translation>Valóban végleg szeretné törölni a bejegyzést: „%1”?</translation>
     </message>
     <message>
         <source>Delete entries?</source>
@@ -656,7 +1040,15 @@ Mindenképp megnyitja?</translation>
     </message>
     <message>
         <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Valóban végleg törli a(z) %1 bejegyzést?</translation>
+        <translation>Valóban végleg szeretne törölni %1 bejegyzést?</translation>
+    </message>
+    <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Kukába dobja a bejegyzést?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Valóban kukába szeretné dobni a bejegyzést: „%1”?</translation>
     </message>
     <message>
         <source>Move entries to recycle bin?</source>
@@ -664,31 +1056,31 @@ Mindenképp megnyitja?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Valóban a kukába dobja az %n elemet?</numerusform><numerusform>Valóban a kukába dobja a(z) %n elemet?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Törli a csoportot?</translation>
+        <source>Execute command?</source>
+        <translation>Végrehajtja a parancsot?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Valóban végleg törli a csoportot: „%1”?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Valóban végrehajtja a következő parancsot? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+        <source>Remember my choice</source>
+        <translation>Válasz megjegyzése</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Kukába dobja a bejegyzést?</translation>
+        <source>Delete group?</source>
+        <translation>Törli a csoportot?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Valóban kukába dobja az elemet: „%1”?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Valóban végleg szeretné törölni a csoportot: „%1”?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Keresés…</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1099,8 @@ Mindenképp megnyitja?</translation>
         <translation>Nincs találat</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Végrehajtja a parancsot?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Valóban végrehajtja a következő parancsot? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Válasz megjegyzése</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Automatikus beolvasási kérelem</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1111,9 @@ Mindenképp megnyitja?</translation>
         <translation>Összeolvasztási kérelem</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Az adatbázisfájl módosult és vannak nem mentett változások. Összeolvasztja a módosításokat?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1129,89 @@ Mindenképp megnyitja?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Bezárás</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Általános</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Jelszó</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Felhasználónév</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Mellékletek</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Jegyzetek</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Ablak</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sorrend</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Keresés</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Törlés</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1238,30 @@ Mindenképp megnyitja?</translation>
         <translation>Előzmények</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH ügynök</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Előzmény-bejegyzés</translation>
     </message>
@@ -794,22 +1282,20 @@ Mindenképp megnyitja?</translation>
         <translation>Új attribútum</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Válasszon fájlt</translation>
+        <source>Confirm Remove</source>
+        <translation>Törlés megerősítése</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>A fájl nem nyitható meg</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Valóban eltávolítja ezt az attribútumot?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Melléklet mentése</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Nem lehet menteni a mellékletet:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1303,16 @@ Mindenképp megnyitja?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n hét</numerusform><numerusform>%n hét</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n hónap</numerusform><numerusform>%n hónap</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 év</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Törlés megerősítése</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Valóban eltávolítja ezt az attribútumot?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[VÉDETT] A megjelenítés vagy a szerkesztés a „Felfedés” gombbal érhető el</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Valóban eltávolítja a mellékletet?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -856,19 +1326,7 @@ Mindenképp megnyitja?</translation>
     </message>
     <message>
         <source>Remove</source>
-        <translation>Törlés</translation>
-    </message>
-    <message>
-        <source>Attachments</source>
-        <translation>Mellékletek</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Mentés</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Megnyitás</translation>
+        <translation>Eltávolítás</translation>
     </message>
     <message>
         <source>Edit Name</source>
@@ -882,12 +1340,28 @@ Mindenképp megnyitja?</translation>
         <source>Reveal</source>
         <translation>Felfedés</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Mellékletek</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation>Automatikus beírás engedélyezése a bejegyzés számára</translation>
+        <translation>Automatikus beírás engedélyezése ennél a bejegyzésnél</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Az alapértelmezett automatikus beírási sorrend öröklése a cso&amp;porttól</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Egyéni automatikus beírási sorrend használata:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Ablaktársítások</translation>
     </message>
     <message>
         <source>+</source>
@@ -902,14 +1376,6 @@ Mindenképp megnyitja?</translation>
         <translation>Ablakcím:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Az alapértelmezett automatikus beírási sorrend öröklése a cso&amp;porttól</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Egyéni automatikus beírási sorrend használata:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>&amp;Alapértelmezett sorrend használata</translation>
     </message>
@@ -917,10 +1383,6 @@ Mindenképp megnyitja?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>&amp;Egyéni sorrend használata:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Ablaktársítások</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -938,18 +1400,14 @@ Mindenképp megnyitja?</translation>
     </message>
     <message>
         <source>Delete all</source>
-        <translation>Minden törlése </translation>
+        <translation>Összes törlése</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Cím:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Felhasználónév:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1418,104 @@ Mindenképp megnyitja?</translation>
         <translation>Ismétlés:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Cím:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Lejárat</translation>
+        <source>Notes</source>
+        <translation>Jegyzetek</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Előbeállítások</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Jegyzetek:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Felhasználónév:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Lejárat</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Vágólapra másolás</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1045,6 +1587,14 @@ Mindenképp megnyitja?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>Alapértelmezett &amp;ikon használata</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>&amp;Egyéni ikon használata</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Egyéni ikon hozzáadása</translation>
     </message>
@@ -1053,6 +1603,18 @@ Mindenképp megnyitja?</translation>
         <translation>Egyéni ikon törlése</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Favicon letöltése</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>A favicon letöltése sikertelen.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Tipp: A Google-t tartalékként az Eszközök&gt;Beállítások&gt;Biztonság menüpontban engedélyezheti</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Képek</translation>
     </message>
@@ -1062,27 +1624,15 @@ Mindenképp megnyitja?</translation>
     </message>
     <message>
         <source>Select Image</source>
-        <translation>Kép kijelölése</translation>
-    </message>
-    <message>
-        <source>Download favicon</source>
-        <translation>Favicon letöltése</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>A favicon letöltése sikertelen.</translation>
+        <translation>Kép kiválasztása</translation>
     </message>
     <message>
         <source>Can&apos;t read icon</source>
         <translation>Az ikon nem olvasható</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>Alapértelmezett &amp;ikon használata</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>&amp;Egyéni ikon használata</translation>
+        <source>Custom icon already exists</source>
+        <translation>Az egyéni ikon már létezik</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1642,6 @@ Mindenképp megnyitja?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Ezt az ikont %1 elem használja, és le lesz cserélve az alapértelmezett ikonra. Valóban törli?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Tipp: A Google-t tartalékként az Eszközök&gt;Beállítások&gt;Biztonság menüpontban engedélyezheti</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Az egyéni ikon már létezik</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1666,94 @@ Mindenképp megnyitja?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - klón</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Név</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Hozzáadás</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Eltávolítás</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Megnyitás</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Mentés</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Törlés megerősítése</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1782,11 @@ Mindenképp megnyitja?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Hivatkozás:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Csoport</translation>
     </message>
@@ -1171,11 +1802,6 @@ Mindenképp megnyitja?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Hivatkozás:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1811,17 @@ Mindenképp megnyitja?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,10 +1884,365 @@ Mindenképp megnyitja?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nem lehet kiutalni a kihívás-választ.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Rossz kulcs vagy sérült adatbázisfájl.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nem lehet kiutalni a kihívás-választ.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Nem KeePass adatbázis.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>A kijelölt fájl egy régi KeePass 1 adatbázis (.kdb).
+
+Be lehet importálni az Adatbázis &gt; „KeePass 1 adatbázis importálása…” menüpontban.
+Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a régi KeePassX 0.4 verzióval.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
-        <translation>Keepass1 adatbázis importálása</translation>
+        <translation>KeePass1 adatbázis importálása</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
@@ -1276,6 +2268,35 @@ Mindenképp megnyitja?</translation>
         <translation>Nem támogatott KeePass adatbázis-verzió.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Gyökér</translation>
     </message>
@@ -1287,129 +2308,141 @@ Mindenképp megnyitja?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Rossz kulcs vagy sérült adatbázisfájl.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Nem KeePass adatbázis.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Nem támogatott KeePass adatbázis-verzió.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Rossz kulcs vagy sérült adatbázisfájl.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nem lehet kiutalni a kihívás-választ.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>A kijelölt fájl egy régi KeePass 1 adatbázis (.kdb).
-
-Be lehet importálni az Adatbázis &gt; „KeePass 1 adatbázis importálása…” menüpontban.
-Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a régi KeePassX 0.4 verzióval.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nem lehet kiutalni a kihívás-választ.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nem lehet kiszámítani a mesterkulcsot</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Végzetes hiba a titkosítási funkciók tesztelése közben.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – Hiba</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>A zárolási fájlt nem lehet létrehozni. Egyedi példány mód letiltva.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>A KeePassXC egy másik példánya is fut.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>A meglévő egypéldányos zárolási fájl érvénytelen. Új példány indítása.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Adatbázis megnyitása</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Adatbázis-beállítások</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Felhasználónév másolása vágólapra</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Jelszó másolása a vágólapra</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Eszköztár megjelenítése</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>Csak olvasható</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Ablak átváltása</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 adatbázis</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Minden fájl</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Javított adatbázis mentése</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>A meglévő egypéldányos zárolási fájl érvénytelen. Új példány indítása.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Az adatbázis írása sikertelen.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>A zárolási fájlt nem lehet létrehozni. Egyedi példány mód letiltva.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>A KeePassXC egy másik példánya is fut.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Végzetes hiba a kriptográfiai funkciók tesztelése közben.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – Hiba</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Adatbázis</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Friss adatbázisok</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importálás</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Súgó</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Be&amp;jegyzések</translation>
     </message>
@@ -1418,12 +2451,16 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>&amp;Attribútum másolása a vágólapra</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>Cso&amp;portok</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Nézet</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Eszközök</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2471,10 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>&amp;Névjegy</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Adatbázis megnyitása…</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Adatbázis &amp;mentése</translation>
     </message>
@@ -1474,24 +2515,24 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>Csoport &amp;törlése</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Adatbázis-&amp;beállítások</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Adatbázis mentése más &amp;néven…</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>Bejegyzés &amp;klónozása</translation>
+        <source>Change &amp;master key...</source>
+        <translation>&amp;Mesterkulcs módosítása…</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Időalapú, egyszer használatos jelszó</translation>
+        <source>&amp;Database settings</source>
+        <translation>Adatbázis-&amp;beállítások</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>&amp;TOTP másolása</translation>
+        <source>Database settings</source>
+        <translation>Adatbázis-beállítások</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>TOTP megjelenítése</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Bejegyzés &amp;klónozása</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2543,26 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>&amp;Felhasználónév másolása</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Felhasználónév másolása a vágólapra</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>&amp;Jelszó másolása</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Jelszó másolása a vágólapra</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Beállítások</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Jelszógenerátor</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Automatikus beírás</translation>
     </message>
@@ -1526,165 +2579,210 @@ Ez egyirányú migráció. Nem lehet majd megnyitni az importált adatbázist a
         <translation>&amp;Cím</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Jegyzetek</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Jelszógenerátor</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Előzmények törlése</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exportálás CSV-fájlba…</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Adatbázis</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>KeePass 1 adatbázis importálása…</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importálás</translation>
+        <source>Import CSV file...</source>
+        <translation>CSV-fájl importálása…</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Eszközök</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Adatbázis &amp;javítása…</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>TOTP megjelenítése</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Kuka ürítése</translation>
+        <source>Set up TOTP...</source>
+        <translation>TOTP beállítása…</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>&amp;TOTP másolása</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Előzmények törlése</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Hozzáférési hiba a beállítási fájlhoz: %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Kilépés a KeePassXC-ből</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Meg kell érinteni a gombot a YubiKeyen!</translation>
+        <source>read-only</source>
+        <translation>csak olvasható</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Súgó</translation>
+        <source>Settings</source>
+        <translation>Beállítások</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Adatbázis megnyitása…</translation>
+        <source>Toggle window</source>
+        <translation>Ablak átváltása</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Adatbázis mentése más &amp;néven…</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Kilépés a KeePassXC-ből</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>&amp;Mesterkulcs módosítása…</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 adatbázis</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exportálás CSV-fájlba…</translation>
+        <source>All files</source>
+        <translation>Minden fájl</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1 adatbázis importálása…</translation>
+        <source>Open database</source>
+        <translation>Adatbázis megnyitása</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>CSV-fájl importálása…</translation>
+        <source>Save repaired database</source>
+        <translation>Javított adatbázis mentése</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Adatbázis &amp;javítása…</translation>
+        <source>Writing the database failed.</source>
+        <translation>Az adatbázis kiírása sikertelen.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>TOTP beállítása…</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Meg kell érinteni a gombot a YubiKeyen!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Párbeszédablak</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Általános</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>É&amp;rtesítés megjelenítése hitelesítési adatok kérésekor</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Találatok rendezése &amp;felhasználónév szerint</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Az összes tárolt bejegyzés jogosultságának &amp;törlése az aktív adatbázisból</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Speciális</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>&amp;Hozzáférés mindenkori engedélyezése a bejegyzésekhez</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Bejegyzések &amp;frissítésének mindenkori engedélyezése</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Keresés minden megnyitott adatbázis bejegyzéseiben</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP port:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Alapértelmezett port: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Adatbázis feloldási &amp;kérelem, ha zárolva van</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Találatok rendezése &amp;cím szerint</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>A KeePassXC ezen a porton fog figyelni: 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nem lehet privilegizált portokhoz kötődni</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nem lehet az 1024 alatti, privilegizált portokhoz kötődni!
-Az alapértelmezett 19455 port lesz használva.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Az összes megosztott titkosítási kulcs &amp;eltávolítása az aktív adatbázisból</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>A „KPH:”-val kezdődő fejlett karakterlánc mezők &amp;visszaadása</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>A karakterlánc mezők automatikus létrehozása vagy frissítése nem támogatott.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Párbeszédablak</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1695,6 +2793,15 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>KeePassHTTP kiszolgáló engedélyezése</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Általános</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>É&amp;rtesítés megjelenítése hitelesítési adatok kérésekor</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Egy konkrét URL-hez tartozó legjobb találatokat adja vissza, a teljes domainhoz tartozó összes bejegyzés helyett.</translation>
     </message>
@@ -1703,6 +2810,10 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>Csak a &amp;legjobb találatok visszaadása</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Adatbázis feloldási &amp;kérelem, ha zárolva van</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Csak az azonos sémájú (http://, https://, ftp://, …) bejegyzések visszaadása.</translation>
     </message>
@@ -1711,27 +2822,108 @@ Az alapértelmezett 19455 port lesz használva.</translation>
         <translation>&amp;URL sémákra illeszkedés</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Találatok rendezése &amp;felhasználónév szerint</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Találatok rendezése &amp;cím szerint</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Az összes megosztott titkosítási kulcs &amp;eltávolítása az aktív adatbázisból</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Az összes tárolt bejegyzés jogosultságának &amp;törlése az aktív adatbázisból</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Jelszógenerátor</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Speciális</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>&amp;Hozzáférés mindenkori engedélyezése a bejegyzésekhez</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Bejegyzések &amp;frissítésének mindenkori engedélyezése</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Csak a kijelölt adatbázishoz kell kapcsolódnia egy klienssel.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>A következő beállítások veszélyesek!
-Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>&amp;Keresés minden megnyitott adatbázis bejegyzéseiben</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>A karakterlánc mezők automatikus létrehozása vagy frissítése nem támogatott.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>A „KPH:”-val kezdődő fejlett karakterlánc mezők &amp;visszaadása</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP port:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Alapértelmezett port: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>A KeePassXC ezen a porton fog figyelni: 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Nem lehet privilegizált portokhoz kötődni</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Nem lehet az 1024 alatti, privilegizált portokhoz kötődni!
+Az alapértelmezett 19455 port lesz használva.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Jelszó:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>erősség</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entrópia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Jelszó</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Karaktertípusok</translation>
     </message>
@@ -1752,38 +2944,50 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
         <translation>Speciális karakterek</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Bővített ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Hasonlóan kinéző karakterek kizárása</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Elfogadás</translation>
+        <source>Pick characters from every group</source>
+        <translation>Karakterek minden csoportból</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Hossz:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>erősség</translation>
+        <source>Passphrase</source>
+        <translation>Jelmondat</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entrópia</translation>
+        <source>Wordlist:</source>
+        <translation>Szólista:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Hossz:</translation>
+        <source>Word Count:</source>
+        <translation>Szavak száma:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Karakterek minden csoportból</translation>
+        <source>Word Separator:</source>
+        <translation>Szóelválasztó:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Előállítás</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Másolás</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Elfogadás</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Bezárás</translation>
     </message>
@@ -1801,51 +3005,270 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Silány</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Gyenge</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Jó</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Kiváló</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Jelszó</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Bővített ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Jelmondat</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Szólista:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Szavak száma:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Szóelválasztó:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Másolás</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Adatbázis útvonala.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Adatbázis tartalmának kinyerése és kiírása.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Kinyerendő adatbázis útvonala.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Végrehajtandó parancs neve.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Adatbázis-bejegyzések felsorolása.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Felsorolandó csoport útvonala. Az alapértelezett: /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Két adatbázis összeolvasztása.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Az összeolvasztás céladatbázisának útvonala.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Az összeolvasztás forrásadatbázisának útvonala.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>attribútum</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>A megjelenítendő bejegyzés neve.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL eszkösz</translation>
@@ -1869,8 +3292,28 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
         <translation>hiányzó lezáró idézőjel</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>BELSŐ - megközelíthetetlen alsó határ átlépve</translation>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 bites</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 bites</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 bites</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – ajánlott)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1889,14 +3332,22 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
         <translation>Jelszó</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Jegyzetek</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>Legutóbb módosítva</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Létrehozva</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation>Hagyományos böngészőintegráció</translation>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Böngészőintegráció</translation>
     </message>
@@ -1912,28 +3363,32 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
         <source>Passive</source>
         <translation>Passzív</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH ügynök</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
     <message>
         <source>Internal zlib error when compressing: </source>
-        <translation>Belső zlib hiba a tömörítés közben:</translation>
+        <translation>Belső zlib hiba a tömörítés közben: </translation>
     </message>
     <message>
         <source>Error writing to underlying device: </source>
-        <translation>Hiba az alárendelt eszközre való írás közben:</translation>
+        <translation>Hiba az alárendelt eszközre való írás közben: </translation>
     </message>
     <message>
         <source>Error opening underlying device: </source>
-        <translation>Hiba az alárendelt eszköz megnyitásakor:</translation>
+        <translation>Hiba az alárendelt eszköz megnyitásakor: </translation>
     </message>
     <message>
         <source>Error reading data from underlying device: </source>
-        <translation>Hiba az alárendelt eszközről történő adatolvasás során:</translation>
+        <translation>Hiba az alárendelt eszközről történő adatolvasás során: </translation>
     </message>
     <message>
         <source>Internal zlib error when decompressing: </source>
-        <translation>Belső zlib hiba kibontás közben:</translation>
+        <translation>Belső zlib hiba kibontás közben: </translation>
     </message>
 </context>
 <context>
@@ -1944,14 +3399,14 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
     </message>
     <message>
         <source>Internal zlib error: </source>
-        <translation>Belső zlib hiba:</translation>
+        <translation>Belső zlib hiba: </translation>
     </message>
 </context>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Nagy- és kisbetű érzékeny</translation>
+        <source>Search...</source>
+        <translation>Keresés…</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1962,8 +3417,8 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
         <translation>Törlés</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Keresés…</translation>
+        <source>Case Sensitive</source>
+        <translation>Nagy- és kisbetű érzékeny</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1973,50 +3428,6 @@ Csak a hatásuk pontos ismeretében érdemes megváltoztatni őket.</translation
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Létezik már egy megosztott titkosítási kulcs ezzel a névvel: „%1”.
-Valóban felülírja?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Frissíti az információt ebben: %1 – %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Az aktív adatbázis zárolt.
-Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell választania.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Sikeresen eltávolításra került %1 titkosítási kulcs a KeePassX/HTTP beállításokból.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nem található megosztott titkosítási kulcs a KeePassHTTP beállításokban.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Az aktív adatbázisban nincs egyetlen KeePassHTTP beállítási bejegyzés sem.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Tárolt jogosultságok törlése…</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Megszakítás</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Sikeresen el lett távolítva a jogosultság innen: %1 %2.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Az aktív adatbázisban nincs egyetlen jogosultsági bejegyzés sem.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Új kulcstársítási kérés</translation>
     </message>
@@ -2032,33 +3443,77 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
         <translation>KeePassXC: Felülírja a létező kulcsot?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Létezik már egy megosztott titkosítási kulcs ezzel a névvel: „%1”.
+Valóban felülírja?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Bejegyzés frissítése</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Frissíti az információt ebben: %1 – %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Adatbázis zárolva!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Az aktív adatbázis zárolt.
+Fel kell oldani a kijelölt adatbázist, vagy egy másik nem zároltat kell választania.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Kulcsok eltávolítva az adatbázisból</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassX/HTTP beállításokból.</numerusform><numerusform>Sikeresen eltávolításra került %n titkosítási kulcs a KeePassX/HTTP beállításokból.</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Nincs találat a kulcsok között</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Nem található megosztott titkosítási kulcs a KeePassHTTP beállításokban.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Nincs ilyen beállítás!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Az aktív adatbázisban nincs egyetlen KeePassHTTP beállítási bejegyzés sem.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Tárolt jogosultságok törlése…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Megszakítás</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Jogosultságok eltávolítva</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform><numerusform>Sikeresen el lett távolítva a jogosultság %n elemről.</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Nem található bejegyzés ilyen jogosultsággal!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Az aktív adatbázisban nincs egyetlen jogosultsági bejegyzés sem.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2082,10 +3537,26 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Alapvető beállítások</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>A KeePassXC többszörös indításának tiltása</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Utolsó adatbázis megjegyzése</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Az utolsó kulcsfájlok és biztonsági hardverkulcsok megjegyzése</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Előző adatbázisok betöltése indításkor</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Automatikus mentés kilépéskor</translation>
     </message>
@@ -2094,20 +3565,28 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
         <translation>Automatikus mentés minden módosítás után</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Külső módosításkor az adatbázis automatikus újratöltése</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
-        <translation>Kicsinyítés válapra való másoláskor</translation>
+        <translation>Kicsinyítés a vágólapra történő másoláskor</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>Indításkor az ablak kicsinyítése</translation>
     </message>
     <message>
         <source>Use group icon on entry creation</source>
         <translation>A csoport ikonjának használata a bejegyzés létrehozásakor</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globális automatikus beírás gyorsbillentyűje</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Nem adatjellegű változások (pl. csoport lenyitása) esetén az adatbázis módosított állapotba kerülésének megakadályozása</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Nyelv</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2118,75 +3597,73 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
         <translation>Az ablak rendszertálcára rejtése kicsinyítéskor</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Előző adatbázisok betöltése indításkor</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Külső módosításkor az adatbázis automatikus újratöltése</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Kilépés helyett rendszertálcára való rejtés</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Indításkor az ablak kicsinyítése</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Basic Settings</source>
-        <translation>Alapvető beállítások</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Az utolsó kulcsfájlok és biztonsági hardverkulcsok megjegyzése</translation>
-    </message>
-    <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Nem adatjellegű változások (pl. csoport lenyitása) esetén az adatbázis módosított állapotba kerülésének megakadályozása</translation>
+        <source>Language</source>
+        <translation>Nyelv</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Automatikus beírás</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Bejegyzések címének és URL-jének alkalmazása az ablakok illesztésénél a globális automatikus beírás számára. </translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Mindig kérdezzen az automatikus beírás megkezdése előtt</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globális automatikus beírás gyorsbillentyűje</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Automatikus beírás késleltetése</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>A KeePassXC többszörös indításának tiltása</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Időtúllépések</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
-        <translation>Vágólap törlése ennyi idő után: </translation>
+        <translation>Vágólap törlése ennyi idő után</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation>mp</translation>
+        <comment>Seconds</comment>
+        <translation> mp</translation>
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
         <translation>Adatbázis zárolása ennyi inaktivitás után</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Jelszavak alapértelmezetten egyszerű szövegként megjelenítése</translation>
+        <source>Convenience</source>
+        <translation>Kényelem</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Adatbázis zárolása munkamenet zárolásakor vagy a fedél lecsukásakor</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2197,16 +3674,16 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
         <translation>Jelszóismétlés elkerülése látható jelszó esetén</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Időtúllépések</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Jelszavak megjelenítése alapértelmezetten egyszerű szövegként</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Kényelem</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Adatbázis zárolása munkamenet zárolásakor vagy a fedél lecsukásakor</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2228,6 +3705,14 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
         <translation>Kulcs:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Egyéni beállítások alkalmazása</translation>
     </message>
@@ -2253,7 +3738,8 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
     </message>
     <message>
         <source> sec</source>
-        <translation>mp</translation>
+        <comment>Seconds</comment>
+        <translation> mp</translation>
     </message>
 </context>
 <context>
@@ -2320,88 +3806,40 @@ A KeePassXC adatbázishoz való hozzáférés engedélyezéséhez egy egyedi né
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>útvonal az egyéni beállítófájlhoz</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>adatbázis kulcsfájlja</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – keresztplatformos jelszókezelő</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>adatbázis jelszó beolvasása az stdin-ről</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>megnyitandó jelszóadatbázisok fájlnevei (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Jelszó másolása vágólapra</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Adatbázis útvonala.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Felugró ablak használata az adatbázis feloldásához.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Levágandó bejegyzés neve.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Adatbázis tartalmának kinyerése és kiírása.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Kinyerendő adatbázis útvonala.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Végrehajtandó parancs neve.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Adatbázis-bejegyzések felsorolása.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Felsorolandó csoport útvonala. Az alapértelezett: /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Bejegyzések és csoportok UUID-inek kiírása.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Két adatbázis összeolvasztása.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – keresztplatformos jelszókezelő</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Az összeolvasztás céladatbázisának útvonala.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>megnyitandó jelszóadatbázisok fájlnevei (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Az összeolvasztás forrásadatbázisának útvonala.</translation>
+        <source>path to a custom config file</source>
+        <translation>útvonal az egyéni beállítófájlhoz</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Azonos jelszó használat mindkét adatbázis fájlhoz.</translation>
+        <source>key file of the database</source>
+        <translation>adatbázis kulcsfájlja</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Jelszó megjelenítése.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>adatbázis jelszó beolvasása az stdin-ről</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>A megjelenítendő bejegyzés neve.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_id.ts b/share/translations/keepassx_id.ts
index 1e04aeb4c..c31659692 100644
--- a/share/translations/keepassx_id.ts
+++ b/share/translations/keepassx_id.ts
@@ -10,14 +10,34 @@
         <translation>Tentang</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Laporkan bug di: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC didistribusikan di bawah GNU General Public License (GPL) versi 2 atau (terserah pilihan Anda) versi 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Pengelola Proyek:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Kontributor</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Lihat Semua Kontribusi pada GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Info Awakutu</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Sertakan informasi berikut setiap Anda melaporkan bug:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Salin ke papan klip</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revisi: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribusi: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Pustaka:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Ekstensi aktif:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Laporkan bug di: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC didistribusikan di bawah GNU General Public License (GPL) versi 2 atau (terserah pilihan Anda) versi 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Pengelola Proyek:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Lihat Semua Kontribusi pada GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Sertakan informasi berikut setiap Anda melaporkan bug:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribusi: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Konfirmasi Akses KeePassXC HTTP</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Ingat tindakan ini</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 telah meminta akses sandi untuk item berikut.
 Silakan pilih apakah Anda ingin mengizinkannya.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Konfirmasi Akses KeePassXC HTTP</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Ketik-Otomatis - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Ketik-Otomatis</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Ketik-Otomatis - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Pilih entri untuk Ketik-Otomatis:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Ketik-Otomatis - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Ingat tindakan ini</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Izinkan</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Tolak</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 telah meminta akses sandi untuk item berikut.
+Silakan pilih apakah Anda ingin mengizinkannya.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>&amp;Minta untuk membuka basis data jika terkunci</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Tingkat Lanjut</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Membuat atau memperbarui ruas lema secara otomatis tidak didukung.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Permintaan asosiasi kunci baru</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Timpa kunci yang ada?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Perbarui Entri</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Apakah Anda ingin memperbarui informasi dalam %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Basis data dikunci!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Basis data aktif dikunci!
+Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Pengaturan tidak tersedia!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Tidak ada kunci yang ditemukan</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Buang kunci dari basis data</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Buang izin</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Tidak entri dengan izin yang ditemukan!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Basis data aktif tidak berisi entri dengan izin.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Ulangi sandi:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Berkas &amp;kunci</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Telusuri</translation>
     </message>
@@ -157,12 +465,20 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Buat</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Segarkan</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Berkas kunci</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Semua berkas</translation>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
         <source>Create Key File...</source>
@@ -177,6 +493,10 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Pilih berkas kunci</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Sandi kosong</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Apakah Anda benar-benar ingin menggunakan lema kosong sebagai sandi?</translation>
     </message>
@@ -191,20 +511,15 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Berkas &amp;kunci</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Segarkan</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Sandi kosong</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Opsi Penggandaan</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Tambahkan &apos; - Salinan&apos; ke judul</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Ganti nama pengguna dan sandi dengan referensi</translation>
     </message>
@@ -225,10 +544,6 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <source>Copy history</source>
         <translation>Salin riwayat</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Tambahkan &apos; - Salinan&apos; ke judul</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -325,10 +640,6 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Impor berkas CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Galat</translation>
     </message>
@@ -339,17 +650,17 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> bita, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> baris, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> kolom</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -371,6 +682,14 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Telusuri</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Segarkan</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Tidak bisa membuka basis data.</translation>
     </message>
@@ -379,8 +698,23 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Tidak bisa membuka berkas kunci</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
-        <translation>Semua berkas</translation>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
         <source>Key files</source>
@@ -390,14 +724,6 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <source>Select key file</source>
         <translation>Pilih berkas kunci</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Segarkan</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -414,14 +740,14 @@ Silakan pilih apakah Anda ingin mengizinkannya.</translation>
         <translation>Tidak bisa membuka berkas kunci</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Basis data terbuka dengan baik. Tidak perlu melakukan apa-apa.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Tidak bisa membuka basis data.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Basis data terbuka dengan baik. Tidak perlu melakukan apa-apa.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Sukses</translation>
     </message>
@@ -439,40 +765,57 @@ Anda bisa menyimpannya sekarang.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nama basis data:</translation>
+        <source>General</source>
+        <translation>Umum</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Deskripsi basis data:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Nama pengguna baku:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
+        <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Maks. item riwayat:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Maks. ukuran riwayat:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Gunakan keranjang sampah</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -483,23 +826,87 @@ Anda bisa menyimpannya sekarang.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritma:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nama basis data:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Deskripsi basis data:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nama pengguna baku:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Maks. item riwayat:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Maks. ukuran riwayat:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Gunakan keranjang sampah</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Root</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>Basis data KeePass 2</translation>
+        <translation>Basis Data KeePass 2</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Semua berkas</translation>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
         <source>Open database</source>
@@ -510,22 +917,48 @@ Anda bisa menyimpannya sekarang.</translation>
         <translation>Berkas tidak ditemukan!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Buka basis data KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Tidak bisa membuka basis data.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Basis data KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Berkas terbuka dalam mode baca-saja.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Buka berkas CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Berkas CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Semua berkas (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Gabung basis data</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Buka basis data KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Basis data KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Tutup?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; dalam mode penyuntingan.
+Tetap buang ubahan dan tutup?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Simpan perubahan?</translation>
     </message>
@@ -537,13 +970,25 @@ Simpan perubahan?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>Gagal membuat basis data.</translation>
+        <translation>Gagal menyimpan basis data.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Sandi</translation>
     </message>
     <message>
         <source>Save database as</source>
         <translation>Simpan basis data sebagai</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Ekspor basis data ke berkas CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Gagal membuat berkas CSV.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Basis data baru</translation>
     </message>
@@ -562,12 +1007,6 @@ Please press cancel to finish your changes or discard them.</source>
 Harap tekan batal untuk menyelesaikan ubahan Anda atau membuangnya.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Basis data ini belum pernah disimpan.
-Anda bisa menyimpan basis data atau berhenti menguncinya.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -575,70 +1014,14 @@ Otherwise your changes are lost.</source>
 Apakah Anda ingin menyimpan basis data sebelum menguncinya?
 Kalau tidak, ubahan Anda akan hilang.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; dalam mode penyuntingan.
-Tetap buang ubahan dan tutup?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Ekspor basis data ke berkas CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Berkas CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Gagal membuat berkas CSV.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Tidak bisa membuka basis data.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Gabung basis data</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Basis data yang ingin Anda simpan dikunci oleh aplikasi KeePassXC yang telah berjalan.
-Apakah Anda tetap ingin menyimpannya?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Sandi</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Basis data sudah terbuka</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Basis data yang ingin Anda simpan dikunci oleh aplikasi KeePassXC yang telah berjalan.
-
-Apakah Anda ingin tetap menyimpannya?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Buka baca-saja</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Berkas terbuka dalam mode baca-saja.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Buka berkas CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Mencari...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Ubah kunci utama</translation>
     </message>
@@ -659,36 +1042,44 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Apakah Anda benar-benar ingin menghapus entri %1 untuk selamanya?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Pindahkan entri ke keranjang sampah?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Apakah Anda benar-benar ingin memindahkan &quot;%1&quot; ke keranjang sampah?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Pindah entri ke keranjang sampah?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Apakah Anda benar-benar ingin memindahkan %n entri ke keranjang sampah?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Hapus grup?</translation>
+        <source>Execute command?</source>
+        <translation>Jalankan perintah?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Apakah Anda benar-benar ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Apakah Anda benar-benar ingin menjalankan perintah berikut?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+        <source>Remember my choice</source>
+        <translation>Ingat pilihan saya</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Pindahkan entri ke keranjang sampah?</translation>
+        <source>Delete group?</source>
+        <translation>Hapus grup?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Apakah Anda benar-benar ingin memindahkan &quot;%1&quot; ke keranjang sampah?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Apakah Anda benar-benar ingin menghapus grup &quot;%1&quot; untuk selamanya?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Mencari...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1098,8 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Tidak Ada Hasil</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Jalankan perintah?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Apakah Anda benar-benar ingin menjalankan perintah berikut?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Ingat pilihan saya</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Otomatis Muat Ulang Permintaan</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1110,9 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Permintaan Penggabungan</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Basis data telah berubah dan Anda memiliki ubahan yang belum disimpan. Apakah Anda ingin menggabungkan ubahan Anda?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1128,89 @@ Apakah Anda ingin tetap menyimpannya?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Tutup</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Sandi</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nama pengguna</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Lampiran</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Catatan</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Jendela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Urutan</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cari</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Bersihkan</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1237,30 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Riwayat</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Riwayat entri</translation>
     </message>
@@ -794,22 +1281,20 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Atribut baru</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Pilih berkas</translation>
+        <source>Confirm Remove</source>
+        <translation>Konfirmasi Buang</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Tidak bisa membuka berkas</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Apakah Anda yakin ingin membuang atribut ini?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Simpan lampiran</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Tidak bisa menyimpan lampiran:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1302,16 @@ Apakah Anda ingin tetap menyimpannya?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n minggu</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n bulan</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 tahun</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Konfirmasi Buang</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Apakah Anda yakin ingin membuang atribut ini?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[DILINDUNGI] Tekan tampilkan untuk meninjau atau mnyunting</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Apakah Anda yakin ingin membuang lampiran ini?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1328,6 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Buang</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Lampiran</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Simpan</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Buka</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Sunting Nama</translation>
     </message>
@@ -882,6 +1339,10 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <source>Reveal</source>
         <translation>Tampilkan</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Lampiran</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1351,18 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Aktifkan Ketik-Otomatis untuk entri ini</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Ikuti urutan Ketik-Otomatis bawaan &amp;grup</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Gunakan &amp;urutan Ketik-Otomatis khusus:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Asosiasi Jendela</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1375,6 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Judul jendela:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Ikuti urutan Ketik-Otomatis bawaan &amp;grup</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Gunakan &amp;urutan Ketik-Otomatis khusus:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Gunakan uru&amp;tan bawaan</translation>
     </message>
@@ -917,10 +1382,6 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Tetapkan urutan &amp;khusus:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Asosiasi Jendela</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1405,8 @@ Apakah Anda ingin tetap menyimpannya?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Judul:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nama pengguna:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1417,104 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Ulangi:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Judul:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Kedaluwarsa</translation>
+        <source>Notes</source>
+        <translation>Catatan</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Prasetel</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Catatan:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nama pengguna:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Kedaluwarsa</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Salin ke papan klip</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1045,6 +1586,14 @@ Apakah Anda ingin tetap menyimpannya?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>G&amp;unakan ikon bawaan</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Gunakan ikon &amp;khusus</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Tambah ikon khusus</translation>
     </message>
@@ -1053,36 +1602,36 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Hapus ikon khusus</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Unduh favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Tidak bisa mengunduh favicon.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Petunjuk: Anda bisa mengaktifkan Google sebagai cadangan di Perkakas&gt;Pengaturan&gt;Keamanan</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Gambar</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Semua berkas</translation>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
         <source>Select Image</source>
         <translation>Pilih gambar</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Unduh favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Tidak bisa mengunduh favicon.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Tidak bisa membaca ikon</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>G&amp;unakan ikon bawaan</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Gunakan ikon &amp;khusus</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1641,6 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Ikon ini digunakan oleh %1 entri, dan akan diganti oleh ikon bawaan. Apakah Anda yakin ingin menghapusnya?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Petunjuk: Anda bisa mengaktifkan Google sebagai cadangan di Perkakas&gt;Pengaturan&gt;Keamanan</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1665,94 @@ Apakah Anda ingin tetap menyimpannya?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - Salinan</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nama</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Tambah</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Buang</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Buka</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Simpan</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Konfirmasi Buang</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1781,11 @@ Apakah Anda ingin tetap menyimpannya?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grup</translation>
     </message>
@@ -1171,11 +1801,6 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1810,17 @@ Apakah Anda ingin tetap menyimpannya?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1883,361 @@ Apakah Anda ingin tetap menyimpannya?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Kunci salah atau berkas basis data rusak.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Bukan basis data KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Berkas yang dipilih adalah basis data lama KeePass 1 (.kdb).
+
+Anda bisa mengimpornya dengan mengklik Basis Data &gt; &apos;Impor basis data KeePass 1...&apos;.
+Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimpor dengan versi lama KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1276,6 +2267,35 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <translation>Versi basis data KeePass tidak didukung.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Root</translation>
     </message>
@@ -1287,129 +2307,141 @@ Apakah Anda ingin tetap menyimpannya?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Kunci salah atau berkas basis data rusak.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Bukan basis data KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Versi basis data KeePass tidak didukung.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Kunci salah atau berkas basis data rusak.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Berkas yang dipilih adalah basis data lama KeePass 1 (.kdb).
-
-Anda bisa mengimpornya dengan mengklik Basis Data &gt; &apos;Impor basis data KeePass 1...&apos;.
-Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimpor dengan versi lama KeePassX 0.4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Tidak bisa mengkalkulasi kunci utama</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Galat saat menguji fungsi kriptografi.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Galat</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Berkas penguncian tidak bisa dibuat. Mode aplikasi tunggal dinonaktifkan.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Aplikasi KeePassXC lainnya sudah berjalan.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Buka basis data</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Pengaturan basis data</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Salin nama pengguna ke papan klip</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Salin sandi ke papan klip</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Pengaturan</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Tampilkan bilah alat</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>baca-saja</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Jungkit jendela</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Basis Data KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Semua Berkas</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Simpan basis data yang sudah diperbaiki</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Berkas penguncian tidak bisa dibuat. Mode aplikasi tunggal dinonaktifkan.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Gagal menyimpan basis data.</translation>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Aplikasi KeePassXC lainnya sudah berjalan.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Galat saat menguji fungsi kriptografi.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Galat</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>Basis &amp;data</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>Basis data ba&amp;ru-baru ini</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Impor</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Bantuan</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>E&amp;ntri</translation>
     </message>
@@ -1418,12 +2450,16 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Salin at&amp;ribut ke papan klip</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grup</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Tampilan</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Perkakas</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2470,10 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Tentang</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Buka basis data...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Simpan basis data</translation>
     </message>
@@ -1474,24 +2514,24 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Hapus grup</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Pengaturan &amp;basis data</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>&amp;Simpan basis data sebagai...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Gandakan entri</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Ubah kunci &amp;utama...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation type="unfinished"/>
+        <source>&amp;Database settings</source>
+        <translation>Pengaturan &amp;basis data</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Salin &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Pengaturan basis data</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Tampilkan TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Gandakan entri</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2542,26 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>Salin &amp;nama pengguna</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Salin nama pengguna ke papan klip</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Salin &amp;sandi</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Salin sandi ke papan klip</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Pengaturan</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Pembuat Sandi</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>Jalankan &amp;Ketik-Otomatis</translation>
     </message>
@@ -1526,164 +2578,210 @@ Ini adalah migrasi satu arah. Anda tidak akan bisa membuka basis data yang diimp
         <translation>&amp;Judul</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Catatan</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Pembuat Sandi</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Bersihkan riwayat</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Ekspor ke berkas CSV...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>Basis &amp;data</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Impor basis data KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Impor</translation>
+        <source>Import CSV file...</source>
+        <translation>Impor berkas CSV...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Perkakas</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Per&amp;baiki basis data...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Tampilkan TOTP</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Kosongkan keranjang sampah</translation>
+        <source>Set up TOTP...</source>
+        <translation>Siapkan TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Salin &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Bersihkan riwayat</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Galat akses untuk berkas konfigurasi %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Keluar KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Silakan sentuh tombol pada YubiKey Anda!</translation>
+        <source>read-only</source>
+        <translation>baca-saja</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Bantuan</translation>
+        <source>Settings</source>
+        <translation>Pengaturan</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Buka basis data...</translation>
+        <source>Toggle window</source>
+        <translation>Jungkit jendela</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>&amp;Simpan basis data sebagai...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Keluar KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Ubah kunci &amp;utama...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Basis Data KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Ekspor ke berkas CSV...</translation>
+        <source>All files</source>
+        <translation>Semua Berkas</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Impor basis data KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Buka basis data</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Impor berkas CSV...</translation>
+        <source>Save repaired database</source>
+        <translation>Simpan basis data yang sudah diperbaiki</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Per&amp;baiki basis data...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Gagal menyimpan basis data.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Siapkan TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Silakan sentuh tombol pada YubiKey Anda!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Umum</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>&amp;Tampilkan notifikasi ketika ada permintaan kredensial</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Urutkan entri yang cocok berdasarkan &amp;nama pengguna</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>&amp;Buang semua izin yang tersimpan dari entri di dalam basis data aktif</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Tingkat Lanjut</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Selalu izinkan &amp;akses ke entri</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Selalu izinkan pembar&amp;uan entri</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>&amp;Cari di dalam semua basis data yang terbuka untuk entri yang cocok</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port bawaan: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>&amp;Minta untuk membuka basis data jika terkunci</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Urutkan entri yang cocok berdasarkan &amp;judul</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC akan mendengarkan port ini pada 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Unknown KDF: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Buang semua kunci enkripsi bersama dari basis data aktif</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unknown key type: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Membuat atau memperbarui ruas lema secara otomatis tidak didukung.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1694,6 +2792,15 @@ Using default port 19455.</source>
         <translation>Aktifkan server KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Umum</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>&amp;Tampilkan notifikasi ketika ada permintaan kredensial</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"/>
     </message>
@@ -1702,6 +2809,10 @@ Using default port 19455.</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>&amp;Minta untuk membuka basis data jika terkunci</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation type="unfinished"/>
     </message>
@@ -1710,27 +2821,107 @@ Using default port 19455.</source>
         <translation>&amp;Cocok skema URL</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Urutkan entri yang cocok berdasarkan &amp;nama pengguna</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Urutkan entri yang cocok berdasarkan &amp;judul</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Buang semua kunci enkripsi bersama dari basis data aktif</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>&amp;Buang semua izin yang tersimpan dari entri di dalam basis data aktif</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Pembuat Sandi</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Tingkat Lanjut</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Selalu izinkan &amp;akses ke entri</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Selalu izinkan pembar&amp;uan entri</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Opsi berikut bisa sangat berbahaya!
-Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>&amp;Cari di dalam semua basis data yang terbuka untuk entri yang cocok</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Membuat atau memperbarui ruas lema secara otomatis tidak didukung.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Port HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Port bawaan: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC akan mendengarkan port ini pada 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Sandi:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>kekuatan</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropi</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Sandi</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Tipe Karakter</translation>
     </message>
@@ -1751,38 +2942,50 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
         <translation>Karakter Spesial</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII Lanjutan</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Kecualikan karakter mirip</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Terima</translation>
+        <source>Pick characters from every group</source>
+        <translation>Pilih karakter dari setiap grup</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Panjang:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>kekuatan</translation>
+        <source>Passphrase</source>
+        <translation>Frasa Sandi</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropi</translation>
+        <source>Wordlist:</source>
+        <translation>Daftar Kata:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Panjang:</translation>
+        <source>Word Count:</source>
+        <translation>Jumlah Kata:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Pilih karakter dari setiap grup</translation>
+        <source>Word Separator:</source>
+        <translation>Pemisah Kata:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Buat</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Salin</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Terima</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Tutup</translation>
     </message>
@@ -1800,51 +3003,270 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Buruk</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Lemah</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Baik</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Sempurna</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Sandi</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII Lanjutan</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Frasa Sandi</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Daftar Kata:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Jumlah Kata:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Pemisah Kata:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Salin</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Jalur ke basis data.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Ekstrak dan tampilkan isi basis data.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Jalur basis data untuk diekstrak.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nama perintah untuk dijalankan.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Daftar entri basis data.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Jalur grup untuk ditampilkan. Bawaan adalah /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Gabungkan dua basis data.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Jalur tujuan basis data untuk digabungkan.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Jalur sumber basis data untuk digabungkan.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nama entri untuk ditampilkan.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Perangkat NULL</translation>
@@ -1868,7 +3290,27 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
         <translation>kehilangan tanda kutip tutup</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1888,14 +3330,22 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
         <translation>Sandi</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Catatan</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Integrasi Peramban</translation>
     </message>
@@ -1911,6 +3361,10 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
         <source>Passive</source>
         <translation>Pasif</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1949,8 +3403,8 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Sensitif Besar Kecil</translation>
+        <source>Search...</source>
+        <translation>Cari...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1961,8 +3415,8 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
         <translation>Bersihkan</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Cari...</translation>
+        <source>Case Sensitive</source>
+        <translation>Sensitif Besar Kecil</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1972,50 +3426,6 @@ Hanya ubah jika Anda tahu apa yang Anda lakukan.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Kunci enkripsi bersama dengan nama &quot;%1&quot; sudah ada.
-Apakah Anda ingin menimpanya?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Apakah Anda ingin memperbarui informasi dalam %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Basis data aktif dikunci!
-Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Berhasil membuang %2-enkripsi %1 dari Pengaturan KeePassX/Http.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Tidak ada kunci-enkripsi bersama yang ditemukan di dalam Pengaturan KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Basis data aktif tidak berisi entri Pengaturan KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Membuang izin yang tersimpan...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Batal</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Berhasil membuang izin dari %1 %2.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Basis data aktif tidak berisi entri dengan izin.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Permintaan asosiasi kunci baru</translation>
     </message>
@@ -2032,33 +3442,77 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
         <translation>KeePassXC: Timpa kunci yang ada?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Kunci enkripsi bersama dengan nama &quot;%1&quot; sudah ada.
+Apakah Anda ingin menimpanya?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Perbarui Entri</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Apakah Anda ingin memperbarui informasi dalam %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Basis data dikunci!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Basis data aktif dikunci!
+Silakan buka kunci atau pilih yang lainnya yang tidak terkunci.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Buang kunci dari basis data</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Tidak ada kunci yang ditemukan</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Tidak ada kunci-enkripsi bersama yang ditemukan di dalam Pengaturan KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Pengaturan tidak tersedia!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Basis data aktif tidak berisi entri Pengaturan KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Membuang izin yang tersimpan...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Buang izin</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Tidak entri dengan izin yang ditemukan!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Basis data aktif tidak berisi entri dengan izin.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2082,10 +3536,26 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Pengaturan Dasar</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Hanya mulai satu aplikasi KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Ingat basis data terakhir</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Ingat berkas kunci dan dongle keamanan terakhir</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Muat basis data sebelumnya saat mulai</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Otomatis simpan ketika keluar</translation>
     </message>
@@ -2094,20 +3564,28 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
         <translation>Otomatis simpan setelah setiap perubahan</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Muat ulang basis data secara otomatis ketika diubah secara eksternal</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimalkan ketika menyalin ke papan klip</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimalkan jendela saat memulai aplikasi</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Gunakan ikon grup pada pembuatan entri</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Pintasan global Ketik-Otomatis</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Jangan tandai basis data telah diubah untuk perubahan non-data (mis. melebarkan grup)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Bahasa</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2118,66 +3596,60 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
         <translation>Sembunyikan jendela ke baki sistem ketika diminimalkan</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Muat basis data sebelumnya saat mulai</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Muat ulang basis data secara otomatis ketika diubah secara eksternal</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Daripada keluar, sembunyikan jendela ke baki sistem</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimalkan jendela saat memulai aplikasi</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Pengaturan Dasar</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Ingat berkas kunci dan dongle keamanan terakhir</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Jangan tandai basis data telah diubah untuk perubahan non-data (mis. melebarkan grup)</translation>
+        <source>Language</source>
+        <translation>Bahasa</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Ketik-Otomatis</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Gunakan pencocokan judul entri dan URL untuk Ketik-Otomatis global</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Selalu bertanya sebelum menjalankan Ketik-Otomatis</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Pintasan global Ketik-Otomatis</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Tundaan Ketik-Otomatis</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>md</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Hanya mulai satu aplikasi KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Kosongkan papan klip setelah</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>det</translation>
     </message>
     <message>
@@ -2185,8 +3657,12 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
         <translation>Kunci basis data setelah tidak aktif selama</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Tampilkan teks sandi secara baku</translation>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Kunci basis data ketika sesi dikunci atau lid ditutup</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2197,16 +3673,16 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
         <translation>Tidak membutuhkan pengulangan sandi ketika ruas bisa dilihat</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Tampilkan teks sandi secara baku</translation>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Hide passwords in the preview panel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Kunci basis data ketika sesi dikunci atau lid ditutup</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2228,6 +3704,14 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
         <translation>Kunci:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Gunakan pengaturan khusus</translation>
     </message>
@@ -2253,6 +3737,7 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>det</translation>
     </message>
 </context>
@@ -2320,88 +3805,40 @@ beri nama yang unik untuk identifikasi dan terimalah.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>jalur ke berkas konfigurasi khusus</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>berkas kunci basis data</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - pengelola sandi lintas platform</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>baca sandi basis data dari stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nama berkas basis data sandi untuk dibuka (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Salin sandi ke papan klip</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Jalur ke basis data.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Gunakan tampilan GUI untuk membuka kunci basis data.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Nama entri untuk disalin.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Ekstrak dan tampilkan isi basis data.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Jalur basis data untuk diekstrak.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nama perintah untuk dijalankan.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Daftar entri basis data.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Jalur grup untuk ditampilkan. Bawaan adalah /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Tampilkan UUID entri dan grup.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge two databases.</source>
-        <translation>Gabungkan dua basis data.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - pengelola sandi lintas platform</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Jalur tujuan basis data untuk digabungkan.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nama berkas basis data sandi untuk dibuka (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Jalur sumber basis data untuk digabungkan.</translation>
+        <source>path to a custom config file</source>
+        <translation>jalur ke berkas konfigurasi khusus</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Gunakan sandi yang sama untuk kedua berkas basis data.</translation>
+        <source>key file of the database</source>
+        <translation>berkas kunci basis data</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Tampilkan sandi.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>baca sandi basis data dari stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nama entri untuk ditampilkan.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_it.ts b/share/translations/keepassx_it.ts
index 582d18970..280d12b19 100644
--- a/share/translations/keepassx_it.ts
+++ b/share/translations/keepassx_it.ts
@@ -10,16 +10,36 @@
         <translation>Informazioni</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Segnala eventuali problemi su: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC è distribuito sotto i termini della licenza GNU General Public License (GPL) versione 2 o (come opzione) versione 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Responsabili del progetto:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Collaboratori</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt; vedere i contributi su GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Informazioni debug</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Quando segnali un problema includi le seguenti informazioni:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
-        <translation>Copia negli Appunti</translation>
+        <translation>Copia negli appunti</translation>
     </message>
     <message>
         <source>Version %1
@@ -32,6 +52,10 @@
         <translation>Revisione: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribuzione: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Librerie:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Estensioni abilitate:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Segnala eventuali problemi in: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC è distribuito sotto i termini della licenza GNU General Public License (GPL) versione 2 o (come opzione) versione 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Manutenzione progetto:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt; vedere i contributi su GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Quando segnali un problema includi le seguenti informazioni:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribuzione: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP conferma accesso</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Ricorda questa decisione</translation>
     </message>
@@ -89,23 +93,46 @@ Kernel: %3 %4</translation>
     <message>
         <source>%1 has requested access to passwords for the following item(s).
 Please select whether you want to allow access.</source>
-        <translation>%1 ha richiesto accesso alle passwords per il seguente elemento/i.
+        <translation>%1 ha richiesto accesso alle password per il seguente elemento/i.
 Seleziona se vuoi consentire l&apos;accesso.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP conferma accesso</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Abilita agente SSH (richiede un riavvio)</translation>
     </message>
 </context>
 <context>
     <name>AutoType</name>
     <message>
         <source>Couldn&apos;t find an entry that matches the window title:</source>
-        <translation>Impossibile trovare un elemento che corrisponda al titolo della finestra:</translation>
+        <translation>Impossibile trovare una voce che corrisponda al titolo della finestra:</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Auto completamento - KeePassXC</translation>
+        <translation>KeePassXC - Completamento automatico</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Completamento automatico</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>La sintassi del tuo comando di auto-completamento non è corretta!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Questo comando di auto-completamento contiene un ritardo molto lungo. Si desidera veramente procedere?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Questo comando di auto-completamento contiene pressioni dei tasti molto lente. Si desidera veramente procedere?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Questo comando di auto-completamento contiene argomenti che molto spesso si ripetono. Si desidera veramente procedere?</translation>
     </message>
 </context>
 <context>
@@ -126,12 +153,289 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>KeePassXC - Completamento automatico</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Seleziona un elemento per l&apos;auto completamento:</translation>
+        <translation>Seleziona una voce per il completamento automatico:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>KeePassXC - Auto completamento</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser confermare l&apos;accesso</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Ricorda questa decisione</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Consenti</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Nega</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 ha richiesto accesso alle password per il seguente elemento/i.
+Seleziona se vuoi consentire l&apos;accesso.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Finestra</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Questo è necessario per accedere al tuo database con KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Abilita l&apos;integrazione con i browser di KeepassXC</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Abilita l&apos;integrazione per i seguenti browser:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Visualizza una &amp;notifica quando sono richieste le credenziali</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Ri&amp;chiedi di sbloccare il database se bloccato</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Vengono restituiti solo voci con lo stesso schema (http://, https://, ...)</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Restituisci solo le corrispondenze migliori per un&apos;URL specifica invece di tutte le voci per l&apos;intero dominio.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Disconnetti tutti i browser</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avanzate</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Solo il database selezionato deve essere collegato con un client.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>La creazione o l&apos;aggiornamento automatico dei campi stringa non è supportato.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Seleziona i campi stringa avanzati che iniziano con &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Utilizzare una posizione &amp;personalizzata per il proxy</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Sfoglia...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Avviso:&lt;/b&gt; le seguenti opzioni possono essere pericolose.</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>File eseguibili (*.exe);;Tutti i file (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>File eseguibili (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Selezionare una posizione personalizzata per il proxy</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: nuova richiesta di associazione chiave</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Salva e permetti l&apos;accesso</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Vuoi sovrascrivere la chiave esistente?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: aggiorna voce</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Vuoi aggiornare le informazioni in %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: database bloccato!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Il database attivo è bloccato!
+Sblocca il database selezionato o scegline un altro che sia sbloccato.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: impostazioni non disponibili!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation>Il database attivo non contiene una voce per le impostazioni.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: nessuna chiave trovata</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation>Nessun chiave condivisa di cifratura è stata trovata nelle impostazioni di KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: chiavi rimosse dal database</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Rimossa con successo %n chiave di cifratura dalle impostazioni di KeePassXC.</numerusform><numerusform>Rimosse con successo %n chiavi di cifratura dalle impostazioni di KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Rimozione dei permessi salvati...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Interrompi</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: permessi rimossi</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Permessi rimossi con successo da %n voce.</numerusform><numerusform>Permessi rimossi con successo da %n voci.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: nessuna voce con permessi trovata!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Il database attivo non contiene una voce con permessi.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Ripeti password:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;File chiave</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Sfoglia</translation>
     </message>
@@ -157,6 +465,14 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Crea</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Risposta di ve&amp;rifica</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Aggiorna</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>File chiave</translation>
     </message>
@@ -177,6 +493,10 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Seleziona un file chiave</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Password vuota</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Vuoi veramente usare una stringa vuota come password?</translation>
     </message>
@@ -191,24 +511,19 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;File chiave</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Risposta di ve&amp;rifica</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Aggiorna</translation>
+        <source>Legacy key file format</source>
+        <translation>Formato di file chiave legacy</translation>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Password vuota</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
-        <translation>Modifica password principale fallitoa. Nessuna YubiKey inserita.</translation>
+        <translation>Modifica non riuscita della password principale: nessuna YubiKey inserita.</translation>
     </message>
 </context>
 <context>
@@ -218,6 +533,10 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Opzioni clonazione</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Aggiungi &apos; - Clone&apos; al titolo</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Sostituisci nome utente e password con riferimenti</translation>
     </message>
@@ -225,10 +544,6 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <source>Copy history</source>
         <translation>Copia cronologia</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Aggiungi &apos;-clone&apos; al titolo</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -274,7 +589,7 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
     </message>
     <message>
         <source>Consider &apos;\&apos; an escape character</source>
-        <translation>Considera &apos; \&apos; un carattere escape</translation>
+        <translation>Considera &apos;\&apos; un carattere escape</translation>
     </message>
     <message>
         <source>Preview</source>
@@ -282,7 +597,7 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
     </message>
     <message>
         <source>Column layout</source>
-        <translation>Disposizione colonna</translation>
+        <translation>Disposizione colonne</translation>
     </message>
     <message>
         <source>Not present in CSV file</source>
@@ -310,7 +625,7 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
     </message>
     <message>
         <source> more messages skipped]</source>
-        <translation> più messaggi ignorati]</translation>
+        <translation> ulteriori messaggi ignorati]</translation>
     </message>
     <message>
         <source>Error</source>
@@ -326,10 +641,6 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importa file CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Errore</translation>
     </message>
@@ -340,17 +651,17 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> byte, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n byte, </numerusform><numerusform>%n byte, </numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> righe, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n riga, </numerusform><numerusform>%n righe, </numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> colonne</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n colonna</numerusform><numerusform>%n colonne</numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Sfoglia</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Aggiorna</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Risposta di verifica:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Impossibile aprire il database.</translation>
     </message>
@@ -380,6 +699,21 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Impossibile aprire il file chiave</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation>Formato di file chiave legacy</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Non mostrare nuovamente questo avviso</translation>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Tutti i file</translation>
     </message>
@@ -391,14 +725,6 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <source>Select key file</source>
         <translation>Seleziona file chiave</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Aggiorna</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Risposta di verifica:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Seleziona se vuoi consentire l&apos;accesso.</translation>
         <translation>Impossibile aprire il file chiave</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Database aperto correttamente. Nessuna operazione da eseguire.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Impossibile aprire il database.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Database aperto correttamente. Nessuna operazione da eseguire.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Completato</translation>
     </message>
@@ -440,40 +766,57 @@ Adesso puoi salvarlo.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nome database:</translation>
+        <source>General</source>
+        <translation>Generale</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Descrizione database:</translation>
+        <source>Encryption</source>
+        <translation>Cifratura</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Arrotondamenti trasformazione:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Numero di giri troppo elevato</translation>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Nome utente predefinito:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MB</translation>
+        <source>Understood, keep number</source>
+        <translation>D&apos;accordo, mantieni il valore</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Prestazioni</translation>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Oggetti max. nella cronologia:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Numero di giri troppo basso</translation>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Grandezza max. cronologia:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Usa il Cestino</translation>
+        <source>KDF unchanged</source>
+        <translation>KDF invariato</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Algoritmo di cifratura:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ Adesso puoi salvarlo.</translation>
         <translation>Twofish: 256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmo:</translation>
+        <source>Key Derivation Function:</source>
+        <translation>Funzione di derivazione di chiave:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Arrotondamenti trasformazione:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Ritardo di 1 secondo di benchmark</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Uso della memoria:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Parallelismo:</translation>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation>thread</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Metadati del database</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nome database:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descrizione database:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nome utente predefinito:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Impostazioni cronologia</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Oggetti max. nella cronologia:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Grandezza max. cronologia:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Usa il cestino</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Radice</translation>
     </message>
     <message>
@@ -511,24 +918,50 @@ Adesso puoi salvarlo.</translation>
         <translation>File non trovato!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Apri database KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Impossibile aprire il database.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Database KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>File aperto in modalità di sola lettura.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Apri file CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>File CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Tutti i file (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Unisci database</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Apri database KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Database KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Vuoi chiudere?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; è in modalità modifica.
+Vuoi annullare le modifiche e chiudere comunque?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
-        <translation>Vuoi salvare modifiche?</translation>
+        <translation>Salvare le modifiche?</translation>
     </message>
     <message>
         <source>&quot;%1&quot; was modified.
@@ -538,13 +971,25 @@ Vuoi salvare le modifiche?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>Scrittura del database fallita.</translation>
+        <translation>Scrittura database non riuscita.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Password</translation>
     </message>
     <message>
         <source>Save database as</source>
         <translation>Salva database come</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Esporta database come file CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Scrittura file CSV non riuscita.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nuovo database</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Seleziona &apos;Annulla&apos; per completare le modifiche o scartarle.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Questo database non è mai stato salvato.
-È possibile salvare il database o interrompere il blocco.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,182 +1015,207 @@ Otherwise your changes are lost.</source>
 Vuoi salvare il database prima di bloccarlo?
 Altrimenti le modifiche verranno perse.</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; è in modalità modifica.
-Vuoi annullare le modifiche e chiudere comunque?</translation>
+        <source>Searching...</source>
+        <translation>Ricerca...</translation>
     </message>
     <message>
-        <source>Export database to CSV file</source>
-        <translation>Esporta database come file CSV</translation>
+        <source>Change master key</source>
+        <translation>Modifica chiave principale</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>File CSV</translation>
+        <source>Delete entry?</source>
+        <translation>Vuoi eliminare la voce?</translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Scrittura file CSV fallita.</translation>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation>Vuoi veramente eliminare la voce &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Impossibile aprire il database.</translation>
+        <source>Delete entries?</source>
+        <translation>Vuoi eliminare le voci?</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Unisci database</translation>
+        <source>Do you really want to delete %1 entries for good?</source>
+        <translation>Vuoi veramente eliminare %1 voci?</translation>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Il database che stai tentando di salvare è bloccato da un&apos;altra istanza di KeePassXC.
-Vuoi salvare comunque?</translation>
+        <source>Move entry to recycle bin?</source>
+        <translation>Vuoi cestinare la voce?</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Password</translation>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Vuoi davvero cestinare la voce &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Database already opened</source>
-        <translation>Database già aperto</translation>
+        <source>Move entries to recycle bin?</source>
+        <translation>Vuoi spostare le voci nel Cestino?</translation>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation><numerusform>Vuoi veramente cestinare %n voce?</numerusform><numerusform>Vuoi veramente cestinare %n voci?</numerusform></translation>
     </message>
     <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Il database che stai cercando di aprire è bloccato da un&apos;altra instanza di KeePassXC.
-Vuoi aprilo comunque?</translation>
+        <source>Execute command?</source>
+        <translation>Vuoi eseguire il comando?</translation>
     </message>
     <message>
-        <source>Open read-only</source>
-        <translation>Apri in sola lettura</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Sei sicuro di voler eseguire il seguente comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>File aperto in modalità di sola lettura.</translation>
+        <source>Remember my choice</source>
+        <translation>Ricorda la mia scelta</translation>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>Apri file CSV</translation>
+        <source>Delete group?</source>
+        <translation>Vuoi eliminare il gruppo?</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseWidget</name>
     <message>
-        <source>Change master key</source>
-        <translation>Modifica chiave principale</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Vuoi veramente eliminare il gruppo &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Delete entry?</source>
-        <translation>Vuoi eliminare l&apos;elemento?</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Impossibile calcolare la chiave principale</translation>
     </message>
     <message>
-        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
-        <translation>Vuoi veramente eliminare l&apos;elemento &quot;%1&quot;?</translation>
+        <source>No current database.</source>
+        <translation>Nessun database attuale.</translation>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Vuoi eliminare gli elementi?</translation>
+        <source>No source database, nothing to do.</source>
+        <translation>Nessun database sorgente. Nessuna operazione da fare.</translation>
     </message>
     <message>
-        <source>Do you really want to delete %1 entries for good?</source>
-        <translation>Vuoi veramente eliminare %1 elementi?</translation>
+        <source>Search Results (%1)</source>
+        <translation>Risultati ricerca (%1)</translation>
     </message>
     <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Vuoi spostare gli elementi nel Cestino?</translation>
+        <source>No Results</source>
+        <translation>Nessun risultato</translation>
     </message>
-    <message numerus="yes">
-        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Vuoi veramente spostare %n elemento nel Cestino?</numerusform><numerusform>Vuoi veramente spostare %n elementi nel Cestino?</numerusform></translation>
+    <message>
+        <source>File has changed</source>
+        <translation>Il file è stato modificato</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Vuoi eliminare il gruppo?</translation>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation>Il file del database è stato modificato. Vuoi caricare le modifiche?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Vuoi veramente eliminare il gruppo &quot;%1&quot;?</translation>
+        <source>Merge Request</source>
+        <translation>Richiesta di unione</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossibile calcolare la chiave principale</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Vuoi spostare l&apos;elemento nel Cestino?</translation>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <translation>Non è stato possibile aprire il nuovo database mentre si tentava il caricamento automatico di questo database.</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Vuoi veramente spostare l&apos;elemento &quot;%1&quot; nel Cestino?</translation>
+        <source>Empty recycle bin?</source>
+        <translation>Svuotare il cestino?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Ricerca...</translation>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation>Sei sicuro di voler eliminare definitivamente tutto dal cestino?</translation>
     </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
     <message>
-        <source>No current database.</source>
-        <translation>Nessun database attuale.</translation>
+        <source>Generate TOTP Token</source>
+        <translation>Generare un token TOTP</translation>
     </message>
     <message>
-        <source>No source database, nothing to do.</source>
-        <translation>Nessun database sorgente. Nessuna operazione da fare.</translation>
+        <source>Close</source>
+        <translation>Chiudi</translation>
     </message>
     <message>
-        <source>Search Results (%1)</source>
-        <translation>Risultati ricerca (%1)</translation>
+        <source>General</source>
+        <translation>Generale</translation>
     </message>
     <message>
-        <source>No Results</source>
-        <translation>Nessun risultato</translation>
+        <source>Password</source>
+        <translation>Password</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Vuoi eseguire il comando?</translation>
+        <source>URL</source>
+        <translation>URL</translation>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Sei sicuro di voler eseguire il seguente comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <source>Expiration</source>
+        <translation>Scadenza</translation>
     </message>
     <message>
-        <source>Remember my choice</source>
-        <translation>Ricorda la mia scelta</translation>
+        <source>Username</source>
+        <translation>Nome utente</translation>
     </message>
     <message>
-        <source>Autoreload Request</source>
-        <translation>Ricaricamento automatico richieste</translation>
+        <source>Autotype</source>
+        <translation>Completamento automatico</translation>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>Il file del database è stato modificato. Vuoi caricare le modifiche?</translation>
+        <source>Searching</source>
+        <translation>Ricerca</translation>
     </message>
     <message>
-        <source>Merge Request</source>
-        <translation>Richiesta di unione</translation>
+        <source>Attributes</source>
+        <translation>Attributi</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Il file del database è stato modificato e ci sono delle modifiche non salvate. Vuoi unire i tuoi cambiamenti?</translation>
+        <source>Attachments</source>
+        <translation>Allegati</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
-        <translation>Non è stato possibile aprire il nuovo database mentre si tentava il caricamento automatico di questo database.</translation>
+        <source>Notes</source>
+        <translation>Note</translation>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
-        <translation>Vuoi svuotare il Cestino?</translation>
+        <source>Window</source>
+        <translation>Finestra</translation>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation>Sei sicuro di voler eliminare tutto definitivamente dal Cestino?</translation>
+        <source>Sequence</source>
+        <translation>Sequenza</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Cerca</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Azzera</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Mai</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTETTO]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Disabilitato</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Abilitato</translation>
     </message>
 </context>
 <context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
-        <translation>Elemento</translation>
+        <translation>Voce</translation>
     </message>
     <message>
         <source>Advanced</source>
@@ -774,16 +1238,40 @@ Vuoi aprilo comunque?</translation>
         <translation>Cronologia</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(cifrato)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Seleziona chiave privata</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>File troppo grande per essere una chiave privata</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Impossibile aprire la chiave privata</translation>
+    </message>
+    <message>
         <source>Entry history</source>
-        <translation>Cronologia elemento</translation>
+        <translation>Cronologia voce</translation>
     </message>
     <message>
         <source>Add entry</source>
-        <translation>Aggiungi elemento</translation>
+        <translation>Aggiungi voce</translation>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation>Modifica elemento</translation>
+        <translation>Modifica voce</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -794,22 +1282,20 @@ Vuoi aprilo comunque?</translation>
         <translation>Nuovo attributo</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Seleziona file</translation>
+        <source>Confirm Remove</source>
+        <translation>Conferma eliminazione</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Impossibile aprire il file</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Sei sicuro di voler rimuovere questo attributo?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Salva allegato</translation>
+        <source>[PROTECTED]</source>
+        <translation>[PROTETTO]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Impossibile salvare l&apos;allegato:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation>Premere rivela per visualizzare o modificare</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -827,22 +1313,6 @@ Vuoi aprilo comunque?</translation>
         <source>1 year</source>
         <translation>Un anno</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Conferma eliminazione</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Sei sicuro di voler rimuovere questo attributo?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[PROTETTO] Seleziona &apos;Rileva&apos; per visualizzare o modificare</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Sei sicuro di voler rimuovere questo allegato?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1329,6 @@ Vuoi aprilo comunque?</translation>
         <translation>Rimuovi</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Allegati</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Salva</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Apri</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Modifica nome</translation>
     </message>
@@ -882,12 +1340,28 @@ Vuoi aprilo comunque?</translation>
         <source>Reveal</source>
         <translation>Rivela</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Allegati</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation>Abilita completamento automatico per questo elemento</translation>
+        <translation>Abilita completamento automatico per questa voce</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Eredita la sequenza per il completamento automatico dal &amp;gruppo</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Usa sequenza di completamento automatico personalizzata:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Associazioni finestra</translation>
     </message>
     <message>
         <source>+</source>
@@ -902,14 +1376,6 @@ Vuoi aprilo comunque?</translation>
         <translation>Titolo finestra:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Eredita la sequenza per il completamento automatico dal &amp;gruppo</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usa sequenza di compeltamento automatico personalizzata:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Usa se&amp;quenza predefinita</translation>
     </message>
@@ -917,10 +1383,6 @@ Vuoi aprilo comunque?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Imposta sequenza &amp;personalizzata:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Associazioni finestra</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1406,8 @@ Vuoi aprilo comunque?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Titolo:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nome utente:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1418,104 @@ Vuoi aprilo comunque?</translation>
         <translation>Ripeti:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Titolo:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Scade</translation>
+        <source>Notes</source>
+        <translation>Note</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Preimpostazioni</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Note:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>Attivare o disattivare la casella di controllo per rivelare la sezione note.</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nome utente:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Scade</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Rimuovi chiave dall&apos;agente dopo</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation> secondi</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Impronta digitale</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>Rimuovi chiave dall&apos;agente quando il database viene chiuso/bloccato</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Chiave pubblica</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Aggiungi chiave all&apos;agente quando il database viene aperto/sbloccato</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Commento</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Decifra</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/a</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copia negli appunti</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Chiave privata</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>File esterno</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Sfoglia...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Allegato</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Aggiungi all&apos;agente</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Rimuovi dall&apos;agente</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Richiesta conferma dell&apos;utente quando questa chiave è usata</translation>
     </message>
 </context>
 <context>
@@ -1045,6 +1587,14 @@ Vuoi aprilo comunque?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Usa icona predefinita</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Usa &amp;icona personalizzata</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Aggiungi icona personalizzata</translation>
     </message>
@@ -1053,6 +1603,18 @@ Vuoi aprilo comunque?</translation>
         <translation>Rimuovi icona personalizzata</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Scarica favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Impossibile scaricare favicon.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Suggerimento: è possibile abilitare Google come alternativa in &apos;Strumenti&apos;&gt;&apos;Impostazioni&apos;&gt;&apos;Sicurezza&apos;</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Immagini</translation>
     </message>
@@ -1065,24 +1627,12 @@ Vuoi aprilo comunque?</translation>
         <translation>Seleziona immagine</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Scarica favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Impossibile scaricare favicon.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Impossibile leggere l&apos;icona</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Usa icona predefinita</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Usa &amp;icona personalizzata</translation>
+        <source>Custom icon already exists</source>
+        <translation>L&apos;icona personalizzata esiste già</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1090,15 +1640,7 @@ Vuoi aprilo comunque?</translation>
     </message>
     <message>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
-        <translation>Questa icona viene usata da %1 elementi, e sarà sostituita dall&apos;icona predefinita. Sei sicuro di volerla eliminare?</translation>
-    </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Suggerimento: è possibile abilitare Google come alternativa in &apos;Strumenti&apos;&gt;&apos;Impostazioni&apos;&gt;&apos;Sicurezza&apos;</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>L&apos;icona personalizzata esiste già</translation>
+        <translation>Questa icona viene usata da %1 voce, e sarà sostituita dall&apos;icona predefinita. Sei sicuro di volerla eliminare?</translation>
     </message>
 </context>
 <context>
@@ -1124,10 +1666,99 @@ Vuoi aprilo comunque?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - Clona</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Dimensione</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Aggiungi</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Rimuovi</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Apri</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Salva</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Seleziona file</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>Sei sicuro di voler rimuovere %n allegato?</numerusform><numerusform>Sei sicuro di voler rimuovere %n allegati?</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Conferma eliminazione</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Salva allegati</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Impossibile creare la directory:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>Sei sicuro di sovrascrivere il file &quot;%1&quot; esistente con l&apos;allegato?</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Confermare la sovrascrittura</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Impossibile salvare l&apos;allegato:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Impossibile aprire l&apos;allegato:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Impossibile aprire gli allegati:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>Impossibile aprire i file:
+%1</translation>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1787,11 @@ Vuoi aprilo comunque?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Rif.: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Gruppo</translation>
     </message>
@@ -1171,11 +1807,6 @@ Vuoi aprilo comunque?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Rif.: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1816,17 @@ Vuoi aprilo comunque?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: impossibile salvare il file.</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Impossibile salvare il file di script nativo di messaggistica.</translation>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1192,7 +1834,7 @@ Vuoi aprilo comunque?</translation>
     </message>
     <message>
         <source>Character Types</source>
-        <translation>Tipi carattere</translation>
+        <translation>Tipi di carattere</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
@@ -1247,6 +1889,361 @@ Vuoi aprilo comunque?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossibile calcolare la chiave principale</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Non in grado dare la risposta di verifica.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Chiave errata o file del database danneggiato.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Non in grado dare la risposta di verifica.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossibile calcolare la chiave principale</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>intestazioni del database mancanti</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossibile calcolare la chiave principale</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Dimensione di checksum dell&apos;intestazione non valida</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Corrispondenza errata dell&apos;intestazione SHA256</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Cifrario sconosciuto</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>Dimensione dell&apos;id dell&apos;intestazione non valida</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>Lunghezza del campo di intestazione non valida</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Lunghezza dei dati di intestazione non valida</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>Dimensione dell&apos;id dell&apos;intestazione interna non valida</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation>Lunghezza del campo di intestazione interna non valida</translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation>Dimensione binaria dell&apos;intestazione interna non valida</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Variante di mappa KeePass non supportata.</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossibile calcolare la chiave principale</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation>Cifrario non supportato</translation>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>Lunghezza dei flag di compressione non valida</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Algoritmo di compressione non supportato</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation>Dimensione del seme principale non valido</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Non è un database KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Il file selezionato è un vecchio database di KeePass 1 (.kdb).
+
+È possibile importarlo facendo clic su &apos;Database&apos; &gt; &apos;Importa database KeePass 1...&apos;.
+Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il database importato con la vecchia versione di KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>Errore nell&apos;analisi XML: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>Nessun gruppo radice</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation>Impossibile decrittografare la stringa della voce</translation>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation>Trovato attributo personalizzato duplicato</translation>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation>Trovato allegato duplicato</translation>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>Valore booleano non valido</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>Valore di data e tempo non valido</translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Valore di colore non valido</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>Valore numerico non valido</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation>Impossibile decomprimere il binario</translation>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1276,6 +2273,35 @@ Vuoi aprilo comunque?</translation>
         <translation>Versione database KeePass non supportata.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>Numero di gruppi non valido</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation>Numero di voci non valido</translation>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation>Impossibile costruire la struttura ad albero dei gruppi</translation>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Radice</translation>
     </message>
@@ -1287,143 +2313,159 @@ Vuoi aprilo comunque?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Chiave errata o file del database danneggiato.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Non è un database KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation>Trasformazione della chiave non riuscita</translation>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Versione database KeePass non supportata.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Chiave errata o file del database danneggiato.</translation>
+        <source>Invalid group field size</source>
+        <translation>Dimensione del campo di gruppo non valida</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossibile calcolare la chiave principale</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Non in grado dare la risposta di verifica.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Il file selezionato è un vecchio database di KeePass 1 (.kdb).
-
-È possibile importarlo facendo clic su &apos;Database&apos; &gt; &apos;Importa database KeePass 1...&apos;.
-Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il database importato con la vecchia versione di KeePassX 0.4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Non in grado dare la risposta di verifica.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossibile calcolare la chiave principale</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Errore fatale durante il test delle funzioni di crittografia.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Errore</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Il file di blocco non può essere creato. La modalità di istanza singola è disattivata.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>È già in esecuzione un&apos;altra istanza di KeePassXC.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Il file di blocco singola istanza non è valido. Esegui una nuova istanza.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Apri database</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Impostazioni database</translation>
+        <source>Invalid entry field size</source>
+        <translation>Dimensione del campo di immissione non valida</translation>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Copia nome utente negli Appunti</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Copia password negli Appunti</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Visualizza barra strumenti</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>sola lettura</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Abilita/disabilita finestra</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Database KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tutti i file</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Salva database riparato</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Il file di blocco singola istanza non è valido. Viene eseguita una nuova istanza.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Scrittura database fallita.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Il file di blocco non può essere creato. La modalità a istanza singola è disattivata.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>È già in esecuzione un&apos;altra istanza di KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Errore fatale durante il test delle funzioni di crittografia.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Errore</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Database</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Database recenti</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importazione</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Aiuto</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
-        <translation>Eleme&amp;nti</translation>
+        <translation>&amp;Voci</translation>
     </message>
     <message>
         <source>Copy att&amp;ribute to clipboard</source>
-        <translation>Copia gli att&amp;ributi negli Appunti</translation>
+        <translation>Copia gli att&amp;ributi negli appunti</translation>
+    </message>
+    <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Groups</source>
         <translation>&amp;Gruppi</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Visualizza</translation>
+        <source>&amp;Tools</source>
+        <translation>S&amp;trumenti</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2476,10 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Informazioni</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>Apri &amp;database...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Salva database</translation>
     </message>
@@ -1451,15 +2497,15 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
     </message>
     <message>
         <source>&amp;Add new entry</source>
-        <translation>&amp;Aggiungi nuovo elemento</translation>
+        <translation>&amp;Aggiungi nuova voce</translation>
     </message>
     <message>
         <source>&amp;View/Edit entry</source>
-        <translation>&amp;Visualizza/modifica elemento</translation>
+        <translation>&amp;Visualizza/modifica voce</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
-        <translation>&amp;Elimina elemento</translation>
+        <translation>&amp;Elimina voce</translation>
     </message>
     <message>
         <source>&amp;Add new group</source>
@@ -1474,24 +2520,24 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Elimina gruppo</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Impostazioni &amp;database</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Sal&amp;va database come...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Clona elemento</translation>
+        <source>Change &amp;master key...</source>
+        <translation>&amp;Modifica chiave principale...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Password monouso temporizzata</translation>
+        <source>&amp;Database settings</source>
+        <translation>Impostazioni &amp;database</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Copia &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Impostazioni database</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Visualizza TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clona voce</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2548,26 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>Copia &amp;nome utente</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copia nome utente negli appunti</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Copi&amp;a password</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copia password negli appunti</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Impostazioni</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Genera password</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Esegui completamento automatico</translation>
     </message>
@@ -1526,165 +2584,210 @@ Si tratta di una migrazione unidirezionale. Non sarà possibile aprire il databa
         <translation>&amp;Titolo</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation>Copia titolo negli appunti</translation>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Copia URL negli appunti</translation>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Note</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Genera password</translation>
+        <source>Copy notes to clipboard</source>
+        <translation>Copia note negli appunti</translation>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Azzera cronologia</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Esporta in file CSV...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Database</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importa database di KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importazione</translation>
+        <source>Import CSV file...</source>
+        <translation>Importa file CSV...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>S&amp;trumenti</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Ri&amp;para database...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Visualizza TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Imposta TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copia &amp;TOTP</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Svuota il Cestino</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>Svuota il cesti&amp;no</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Azzera cronologia</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Errore di accesso per il file di configurazione %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Esci da KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Seleziona il pulsante nelal YubiKey!</translation>
+        <source>read-only</source>
+        <translation>sola lettura</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Aiuto</translation>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>Apri &amp;database...</translation>
+        <source>Toggle window</source>
+        <translation>Abilita/disabilita finestra</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Sal&amp;va database come...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Esci da KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>&amp;Modifica chiave principale...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Database KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Esporta in file CSV...</translation>
+        <source>All files</source>
+        <translation>Tutti i file</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importa database di KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Apri database</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importa file CSV...</translation>
+        <source>Save repaired database</source>
+        <translation>Salva database riparato</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Ri&amp;para database...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Scrittura database non riuscita.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Imposta TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Premi il pulsante della YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Finestra</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>File di chiave non valido, era attesa una chiave OpenSSH</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Generale</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Visualizza una n&amp;otifica quando sono richeste le credenziali</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation>Questa non è una chiave OpenSSH, sono supportate solo chiavi moderne</translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordina elementi trovati per &amp;nome utente</translation>
+        <source>Base64 decoding failed</source>
+        <translation>Decodifica base64 non riuscita</translation>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>R&amp;imuovi tutti i permessi presenti negli elementi nel database attivo</translation>
+        <source>Key file way too small.</source>
+        <translation>File chiave decisamente troppo piccolo.</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avanzate</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permetti  sempre di &amp;accedere agli elementi</translation>
+        <source>Found zero keys</source>
+        <translation>Trovate zero chiavi</translation>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permetti sempre di &amp;aggiornare gli elementi</translation>
+        <source>Failed to read public key.</source>
+        <translation>Impossibile leggere la chiave privata.</translation>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Cerc&amp;a in tutti i database aperti gli elementi corrispondenti</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>File della chiave rovinato, impossibile leggere la chiave privata</translation>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Porta HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Porta predefinita: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation>Cifrario sconosciuto:</translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Ri&amp;chiedi di sbloccare il database se bloccato</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordina gli elementi per &amp;titolo</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC rimarrà in ascolto su questa porta su 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>Derivazione della chiave non riuscita, file della chiave rovinato?</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Non è stato possibile collegarsi ad una porta privilegiata</translation>
+        <source>Unknown KDF: </source>
+        <translation>KDF sconosciuto: </translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Non è possibile usare porte sotto la 1024!
-Usa la porta predefinita 19455.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>Decifrazione non riuscita, passpharse non corretta?</translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;imuovi tutte le chiavi condivise di cifratura dal database attivo</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Seleziona i campi stringa avanzati che iniziano con &quot;KPH: &quot;</translation>
+        <source>Unknown key type: </source>
+        <translation>Tipo di chiave sconosciuto:</translation>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>La creazione o l&apos;aggiornamento automatico dei campi stringa non è supportato.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Impossibile scrivere la chiave pubblica perché è vuota</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Impossibile scrivere la chiave privata perché è vuota</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Finestra</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1695,45 +2798,139 @@ Usa la porta predefinita 19455.</translation>
         <translation>Atttiva il server KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Generale</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Visualizza una n&amp;otifica quando sono richieste le credenziali</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Restituisci solo le corrispondenze migliori per un&apos;URL specifica invece di tutte gli elementi per l&apos;intero dominio.</translation>
+        <translation>Restituisci solo le corrispondenze migliori per un&apos;URL specifica invece di tutte le voci per l&apos;intero dominio.</translation>
     </message>
     <message>
         <source>&amp;Return only best matching entries</source>
-        <translation>&amp;Restituisci solo gli elementi corrispondenti migliori</translation>
+        <translation>&amp;Restituisci solo le corrispondenti migliori</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Ri&amp;chiedi di sbloccare il database se bloccato</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation>Solo gli elementi con lo stesso schema (http://, https://, ftp: //, ...) vengono restituite.</translation>
+        <translation>Solo le voci con lo stesso schema (http://, https://, ftp: //, ...) vengono restituite.</translation>
     </message>
     <message>
         <source>&amp;Match URL schemes</source>
-        <translation>Sche&amp;ma corrispndenza URL</translation>
+        <translation>Corrispondenza sche&amp;mi URL</translation>
+    </message>
+    <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Ordina voci trovate per nome &amp;utente</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Ordina le voci per &amp;titolo</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>R&amp;imuovi tutte le chiavi condivise di cifratura dal database attivo</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>R&amp;imuovi tutti i permessi presenti nelle voci nel database attivo</translation>
     </message>
     <message>
         <source>Password Generator</source>
         <translation>Genera password</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Avanzate</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Permetti sempre di &amp;accedere alle voci</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Permetti sempre di &amp;aggiornare le voci</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Solo il database selezionato deve essere collegato con un client.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Le seguenti opzioni possono essere pericolose!
-Modificale solo se sai quello che stai facendo.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Cerc&amp;a in tutti i database aperti le voci corrispondenti</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>La creazione o l&apos;aggiornamento automatico dei campi stringa non è supportato.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Seleziona i campi stringa avanzati che iniziano con &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Porta HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Porta predefinita: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC rimarrà in ascolto su questa porta su 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Avviso:&lt;/b&gt; le seguenti opzioni possono essere pericolose.</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Non è stato possibile collegarsi ad una porta privilegiata</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Non è possibile usare porte sotto la 1024!
+Viene usata la porta predefinita 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Password:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>affidabilità</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
         <source>Character Types</source>
-        <translation>Tipi carattere</translation>
+        <translation>Tipi di carattere</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
@@ -1752,38 +2949,50 @@ Modificale solo se sai quello che stai facendo.</translation>
         <translation>Caratteri speciali</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII esteso</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Escludi caratteri simili</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Accetta</translation>
+        <source>Pick characters from every group</source>
+        <translation>Seleziona caratteri da ogni gruppo</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Lunghezza:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>affidabilità</translation>
+        <source>Passphrase</source>
+        <translation>Frase accesso</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropia</translation>
+        <source>Wordlist:</source>
+        <translation>Elenco termini:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Lunghezza:</translation>
+        <source>Word Count:</source>
+        <translation>Conteggio parole:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Seleziona caratteri da ogni gruppo</translation>
+        <source>Word Separator:</source>
+        <translation>Separatore parole:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Genera</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Copia</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Accetta</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Chiudi</translation>
     </message>
@@ -1801,51 +3010,273 @@ Modificale solo se sai quello che stai facendo.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Debole</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Intermedia</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Buona</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Eccellente</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Password</translation>
+        <source>Database not opened</source>
+        <translation>Database non aperto</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII esteso</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Frase accesso</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Elenco termini:</translation>
+        <source>Cannot decrypt message</source>
+        <translation>Impossibile decrittografare il messaggio</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Conteggio parole:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Separatore parole:</translation>
+        <source>Action cancelled or denied</source>
+        <translation>Azione annullata o negata</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copia</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>Chiave di crittografia non riconosciuta</translation>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation>Nessun database salvato trovato</translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation>Azione non corretta</translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation>Ricevuto un messaggio vuoto</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>Nessun URL fornito</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>Nessun login trovato</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Errore sconosciuto</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation>Aggiungi una nuova voce al database.</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Percorso del database.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>File chiave del database.</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>percorso</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>Nome utente della voce.</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>nome utente</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL della voce.</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation>Richiedi la password della voce.</translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation>Genera una password per questa voce.</translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation>Lunghezza della password generata.</translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>lunghezza</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>Percorso della voce da aggiungere.</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation>Copia la password di una voce negli appunti.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>Intervallo di tempo in secondi prima di ripulire gli appunti.</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Modifica una voce.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Titolo di una voce.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>titolo</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation>Percorso della voce da modificare.</translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation>Stima l&apos;entropia di una password.</translation>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation>Password di cui stimare l&apos;entropia.</translation>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation>Esegui un&apos;analisi avanzata sulla password.</translation>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Estrai e stampa il contenuto di un database.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Percorso del database da estrarre.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation>Inserisci la password per sbloccare %1:</translation>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation>Impossibile caricare il file chiave %1: %2</translation>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation>
+
+Comandi disponibili:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nome del comando da eseguire.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Elenco delle voci del database.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Percorso del gruppo da elencare. L&apos;impostazione predefinita è /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation>Cerca voci rapidamente.</translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation>Termine di ricerca.</translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Unisci due database.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Percorso del database destinazione da unire.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Percorso del database sorgente da unire.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Usa le stesse credenziali per entrambi i file di database.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>File chiave del database da unire</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation>Mostra la informazioni di una voce.</translation>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>attributo</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nome della voce da visualizzare.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Periferica NULL</translation>
@@ -1869,8 +3300,28 @@ Modificale solo se sai quello che stai facendo.</translation>
         <translation>virgoletta di chiusura mancante</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>INTERNO - limite unget inferiore superato</translation>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256 bit</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256 bit</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256 bit</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – raccomandato)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1889,20 +3340,28 @@ Modificale solo se sai quello che stai facendo.</translation>
         <translation>Password</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Note</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>Ultima modifica</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Creazione</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Integrazione con i browser</translation>
     </message>
     <message>
         <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
-        <translation>YubiKey [%1] risposta di verifica - slot %2 - %3</translation>
+        <translation>Risposta di verifica da YubiKey[%1] - slot %2 - %3</translation>
     </message>
     <message>
         <source>Press</source>
@@ -1912,6 +3371,10 @@ Modificale solo se sai quello che stai facendo.</translation>
         <source>Passive</source>
         <translation>Passiva</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1925,7 +3388,7 @@ Modificale solo se sai quello che stai facendo.</translation>
     </message>
     <message>
         <source>Error opening underlying device: </source>
-        <translation>Errore durante l&apos;apertura dal dispositivo: </translation>
+        <translation>Errore durante l&apos;apertura del dispositivo: </translation>
     </message>
     <message>
         <source>Error reading data from underlying device: </source>
@@ -1950,8 +3413,8 @@ Modificale solo se sai quello che stai facendo.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Sensibile maiuscole/minuscole</translation>
+        <source>Search...</source>
+        <translation>Ricerca...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1962,8 +3425,8 @@ Modificale solo se sai quello che stai facendo.</translation>
         <translation>Azzera</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Ricerca...</translation>
+        <source>Case Sensitive</source>
+        <translation>Distingui maiuscole</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1973,92 +3436,92 @@ Modificale solo se sai quello che stai facendo.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Una chiave di criptazione condivisa con il nome &quot;%1&quot; esiste già.
-Vuoi sovrascriverla?</translation>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: nuova richiesta di associazione chiave</translation>
     </message>
     <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Vuoi aggiornare le informazioni in %1 - %2?</translation>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
+        <translation>Hai ricevuto una richiesta di associazione per la chiave sovrastante.
+Se vuoi permetterle di accedere al database KeePassXC
+imposta un nome unico per identificarla ed accettarla.</translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Il database attivo è bloccato!
-Sblocca il database selezionato o scegli un altro database sbloccato.</translation>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Vuoi sovrascrivere la chiave esistente?</translation>
     </message>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Rimosso correttamente %1 encryption-%2 dalle impostazioni KeePassX/Http.</translation>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Una chiave di cifratura condivisa con il nome &quot;%1&quot; esiste già.
+Vuoi sovrascriverla?</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nessuna chiave di criptazione condivisa è stata trovata nelle impostazioni di KeePassHttp.</translation>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: aggiorna voce</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Il database attivo non contiene nessun elemento delle impostazioni di KeePassHttp.</translation>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Vuoi aggiornare le informazioni in %1 - %2?</translation>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
-        <translation>Rimozione dei permessi salvati...</translation>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: database bloccato!</translation>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>Annulla</translation>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Il database attivo è bloccato!
+Sblocca il database selezionato o scegline un altro che sia sbloccato.</translation>
     </message>
     <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Permessi rimossi correttamente da %1 %2.</translation>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: chiavi rimosse dal database</translation>
     </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Il database attivo non contiene un elemento con permessi.</translation>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation>KeePassXC: Nuova richiesta di associazione chiave</translation>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: nessuna chiave trovata</translation>
     </message>
     <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation>Hai ricevuto una richiesta di associazione per la chiave sovrastante.
-Se vuoi permetterle di accedere al database KeePassXC
-imposta un nome unico per identificarla ed accettarla.</translation>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Nessun chiave condivisa di cifratura è stata trovata nelle impostazioni di KeePassHttp.</translation>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC- Vuoi sovrascrivere la chiave esistente?</translation>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: impostazioni non disponibili!</translation>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC- Aggiorna elemento</translation>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Il database attivo non contiene nessun voce delle impostazioni di KeePassHttp.</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC- Database bloccato!</translation>
+        <source>Removing stored permissions...</source>
+        <translation>Rimozione dei permessi salvati...</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC - Chiavi rimosse dal database</translation>
+        <source>Abort</source>
+        <translation>Interrompi</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC - Nessuna chiave trovata</translation>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: permessi rimossi</translation>
     </message>
-    <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC - Impostazioni non disponibili!</translation>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation><numerusform>Permessi rimossi con successo da %n voce.</numerusform><numerusform>Permessi rimossi con successo da %n voci.</numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: Removed permissions</source>
-        <translation>KeePassXC - Permessi rimossi</translation>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: nessuna voce con permessi trovata!</translation>
     </message>
     <message>
-        <source>KeePassXC: No entry with permissions found!</source>
-        <translation>KeePassXC - Nessun elemento con permessi trovata!</translation>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Il database attivo non contiene una voce con permessi.</translation>
     </message>
 </context>
 <context>
@@ -2083,10 +3546,26 @@ imposta un nome unico per identificarla ed accettarla.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Impostazioni di base</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Avvia una sola istanza di KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Ricorda ultimo database</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Ricorda gli ultimi file chiave e dongle di sicurezza</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Carica i database precedenti all&apos;avvio</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Salva automaticamente all&apos;uscita</translation>
     </message>
@@ -2095,90 +3574,92 @@ imposta un nome unico per identificarla ed accettarla.</translation>
         <translation>Salva automaticamente dopo ogni modifica</translation>
     </message>
     <message>
-        <source>Minimize when copying to clipboard</source>
-        <translation>Minimizza quando si copia negli Appunti</translation>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Ricarica automaticamente il database quando ci sono modifiche esterne</translation>
     </message>
     <message>
-        <source>Use group icon on entry creation</source>
-        <translation>Usa icona del gruppo alla creazione di un elemento</translation>
+        <source>Minimize when copying to clipboard</source>
+        <translation>Minimizza quando si copia negli appunti</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Scorciatoia completamento automatico globale</translation>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizza la finestra all&apos;avvio della applicazione</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Lingua</translation>
+        <source>Use group icon on entry creation</source>
+        <translation>Usa icona del gruppo alla creazione di una voce</translation>
     </message>
     <message>
-        <source>Show a system tray icon</source>
-        <translation>Visualizza un&apos;icona nell&apos;area di notifica del sistema</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Non contrassegnare il database come modificato per modifiche non riguardanti i dati (ad es. espansione dei gruppi)</translation>
     </message>
     <message>
-        <source>Hide window to system tray when minimized</source>
-        <translation>Nascondi la finestra nell&apos;area di notifica del sistema quando viene minimizzata</translation>
+        <source>Hide the Details view</source>
+        <translation>Nascondere la vista dei dettagli</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>All&apos;avvio carica i database precedenti</translation>
+        <source>Show a system tray icon</source>
+        <translation>Visualizza un&apos;icona nell&apos;area di notifica di sistema</translation>
     </message>
     <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Ricarica automaticamente il database quando ci sono modifiche esterne</translation>
+        <source>Hide window to system tray when minimized</source>
+        <translation>Nascondi la finestra nell&apos;area di notifica di sistema quando viene minimizzata</translation>
     </message>
     <message>
         <source>Hide window to system tray instead of app exit</source>
-        <translation>Nascondi la finestra nella barra di sistema invece di chiudere l&apos;applicazione</translation>
-    </message>
-    <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimizza la finestra all&apos;avvio della applicazione</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Impostazioni di base</translation>
+        <translation>Nascondi la finestra nell&apos;area di notifica di sistema invece di chiudere l&apos;applicazione</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Ricorda gli ultimi file chiave e dongle di sicurezza</translation>
+        <source>Dark system tray icon</source>
+        <translation>Icona scura per l&apos;area di notifica di sistema</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Non contrassegnare il database come modificato per modifiche non riguardanti i dati (ad es. espansione dei gruppi)</translation>
+        <source>Language</source>
+        <translation>Lingua</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Completamento automatico</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Usa il titolo dell&apos;elemento e l&apos;URL per abbinare le finestre per il completamento automatico globale</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Usa il titolo della voce per la corrispondenza con le finestre per il completamento automatico globale</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Usa URL della voce per la corrispondenza con le finestre per il completamento automatico globale</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Chiedi sempre prima di effettuare il completamento automatico</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Scorciatoia globale per l&apos;auto-completamento</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Ritardo completamento automatico</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Avvia una sola istanza di KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Timeout</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
-        <translation>Svuota Appunti dopo</translation>
+        <translation>Svuota gli appunti dopo</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> sec</translation>
     </message>
     <message>
@@ -2186,8 +3667,12 @@ imposta un nome unico per identificarla ed accettarla.</translation>
         <translation>Blocca i database dopo un&apos;inattività di</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Visualizza la password in chiaro in maniera predefinita</translation>
+        <source>Convenience</source>
+        <translation>Comodità</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Blocca i database quando la sessione è bloccata o il coperchio è chiuso</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2198,20 +3683,20 @@ imposta un nome unico per identificarla ed accettarla.</translation>
         <translation>Non richiedere di ripetere la password quando è visibile</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Timeout</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Visualizza la password in chiaro in maniera predefinita</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Comodità</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation>Nascondere le password nel pannello di anteprima</translation>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Blocca i database quando la sessione è bloccata o il coperchio è chiuso</translation>
+        <source>Hide entry notes by default</source>
+        <translation>Nascondere le note della voce per impostazione predefinita</translation>
     </message>
     <message>
         <source>Privacy</source>
-        <translation>Privacy</translation>
+        <translation>Riservatezza</translation>
     </message>
     <message>
         <source>Use Google as fallback for downloading website icons</source>
@@ -2229,6 +3714,14 @@ imposta un nome unico per identificarla ed accettarla.</translation>
         <translation>Chiave:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Usa le impostazioni personalizzate</translation>
     </message>
@@ -2254,6 +3747,7 @@ imposta un nome unico per identificarla ed accettarla.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> sec</translation>
     </message>
 </context>
@@ -2321,88 +3815,40 @@ imposta un nome unico per identificarla ed accettarla.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>percorso ad un file di configurazione personalizzato</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>file chiave del database</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Gestore password multipiattaforma</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>leggi la password del database da stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>i nomi dei file dei database delle password da aprire (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Copia una password negli Appunti</translation>
+        <source>Remove an entry from the database.</source>
+        <translation>Rimuovi una voce dal database.</translation>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Percorso del database.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Usa una richiesta grafica per lo sblocco del database.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Nome dell&apos;elemento da tagliare.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Estrai e stampa il contenuto di un database.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation>Percorso della voce da rimuovere.</translation>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
-        <translation>Percorso del database da estrarre.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nome del comando da eseguire.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Elenco degli elementi del database.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Percorso del gruppo da elencare. L&apos;impostazione predefinita è /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Stampa gli UUID degli elementi e dei gruppi.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Unisci due database.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gestore di password multipiattaforma</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Percorso del database destinazione da unire.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>i nomi dei file di database delle password da aprire (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Percorso del database sorgente da unire.</translation>
+        <source>path to a custom config file</source>
+        <translation>percorso ad un file di configurazione personalizzato</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Usa la stessa password per entrambi i file dei database.</translation>
+        <source>key file of the database</source>
+        <translation>file chiave del database</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Visualizza una password.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>leggi la password del database da stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nome dell&apos;elemento da visualizzare.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ja.ts b/share/translations/keepassx_ja.ts
index dd349640f..c2bf7e52c 100644
--- a/share/translations/keepassx_ja.ts
+++ b/share/translations/keepassx_ja.ts
@@ -10,14 +10,34 @@
         <translation>このソフトウェアについて</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>バグ報告先: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC は GNU General Public License (GPL) version 2 または version 3 (どちらかを選択)の条件で配布されます。</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>プロジェクトメンテナ:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>貢献者</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;GitHub で貢献を確認する&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>デバッグ情報</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>バグを報告する際に下記の情報を含めてください:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>クリップボードにコピー</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>リビジョン: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>配布形式: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>ライブラリ:</translation>
     </message>
@@ -47,34 +71,14 @@ CPU アーキテクチャ: %2
         <source>Enabled extensions:</source>
         <translation>有効化された拡張機能:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>バグ報告先: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC は GNU General Public License (GPL) version 2 または version 3 (どちらかを選択)の条件で配布されます。</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>プロジェクトメンテナ:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;GitHub で貢献を確認する&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>バグを報告する際に下記の情報を含めてください:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>配布形式: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP アクセス確認</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>この決定を記憶する</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 が以下の項目のパスワードへのアクセスを要求しました。
 アクセスを許可するかどうかを選択してください。</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP アクセス確認</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>SSH エージェントを有効にする (再起動が必要)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>自動入力 - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>自動入力</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>自動入力ステートメントの構文が正しくありません。</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>この自動入力コマンドは非常に長い遅延を含みます。本当に続行しますか？</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>この自動入力コマンドは非常に遅いキー押下を含みます。本当に続行しますか？</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,293 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>自動入力 - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>自動入力するエントリーを選択してください:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>自動入力 - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser アクセス確認</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>この決定を記憶する</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>許可</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>拒否</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 が以下の項目のパスワードへのアクセスを要求しました。
+アクセスを許可するかどうかを選択してください。</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>ダイアログ</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>このオプションは KeePassXC-Browser からデータベースにアクセスするために必要です</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>KeepassXC のブラウザ統合を有効にする</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>これらのブラウザの統合を有効にする:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>Google Chrome(&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>Firefox(&amp;F)</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>Chromium(&amp;C)</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>Vivaldi(&amp;V)</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>クレデンシャルを要求された際に通知を表示する(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>データベースがロックされている場合はロックの解除を要求する(&amp;Q)</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>同じスキーム (http://, https://, ...) を持つエントリーのみが返されます。</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>URL スキーム (例えば https://...) のマッチ(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>ドメイン全体にマッチする全てのエントリーの代わりに、特定の URL に最もマッチするエントリーのみが返されます。</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>最もマッチするクレデンシャルのみを返す(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>マッチするクレデンシャルをタイトルで並べ替える(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>マッチするクレデンシャルをユーザー名で並べ替える(&amp;U)</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>全てのブラウザの接続を断つ(&amp;D)</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>記憶された全てのアクセス許可を破棄する(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>詳細設定</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>クレデンシャルにアクセスする前に確認しない(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>クレデンシャルをアップデートする前に確認しない(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>選択されたデータベースのみがクライアントと接続する必要があります。</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>全ての開かれたデータベースからマッチするクレデンシャルを検索する(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>文字列フィールドの自動作成や自動更新はサポートされていません。</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&quot;KPH: &quot; から始まる拡張された文字列フィールドを返す(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation>起動時に、KeePassXC または keepassxc-proxy のバイナリーパスを自動的に Native messaging スクリプトに更新します。</translation>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation>起動時に Native messaging のマニフェストファイルを更新する(&amp;N)</translation>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>KeePassXC とブラウザの拡張機能との間でプロキシアプリケーションをサポートします。</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation>KeePassXC とブラウザの拡張機能との間でプロキシアプリケーションを使用する(&amp;P)</translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>カスタムプロキシを使用する(&amp;C)</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>参照...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;警告:&lt;/b&gt; 以下は危険なオプションです。</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>実行ファイル (*.exe);;全てのファイル (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>実行ファイル (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>カスタムプロキシを選択する</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: 新しいキーのアソシエーション要求</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation>他のアプリケーションからのアソシエーション要求を受け取りました。
+
+KeePassXC のデータベースへのアクセスを許可したい場合は、
+要求元を識別して受け入れるためのユニークな名前を付けてください。</translation>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>アクセスを許可して保存</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: 既存のキーを上書きしますか？</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>共有暗号化キー &quot;%1&quot; は既に存在します。
+上書きしますか？</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: エントリーを更新</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>%1 - %2 の情報を更新しますか？</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: データベースはロックされています</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>アクティブなデータベースがロックされています。
+選択されたデータベースのロックを解除するか、別のロックされていないデータベースを選択してください。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: 設定は利用できません</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation>アクティブなデータベースに設定のエントリーが含まれていません。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: キーが見つかりません</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation>KeePassXC の設定内に共有暗号化キーは見つかりませんでした。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: データベースからキーが削除されました</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>KeePassXC の設定から %n 個の暗号化キーが無事に削除されました。</numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>保存されたアクセス許可を削除しています…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: アクセス許可が削除されました</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>%n 個のエントリーから無事にアクセス許可が削除されました。</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: アクセス許可があるエントリーは見つかりません</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>アクティブなデータベースにはアクセス許可があるエントリーは含まれていません。</translation>
     </message>
 </context>
 <context>
@@ -149,6 +457,10 @@ Please select whether you want to allow access.</source>
         <translation>パスワードを再入力:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>キーファイル(&amp;K)</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>参照</translation>
     </message>
@@ -157,6 +469,14 @@ Please select whether you want to allow access.</source>
         <translation>作成</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>チャレンジレスポンス(&amp;L)</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>再読み込み</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>キーファイル</translation>
     </message>
@@ -177,6 +497,10 @@ Please select whether you want to allow access.</source>
         <translation>キーファイルを選択</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>空パスワード</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>本当にパスワードとして空の文字列を使用しますか？</translation>
     </message>
@@ -191,20 +515,18 @@ Please select whether you want to allow access.</source>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>キーファイル(&amp;K)</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>チャレンジレスポンス(&amp;L)</translation>
+        <source>Legacy key file format</source>
+        <translation>レガシーなキーファイル形式</translation>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>再読み込み</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>空パスワード</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>レガシーなキーファイル形式は、将来的に、
+サポートされなくなる可能性があります。
+
+新しいキーファイルの生成を検討してください。</translation>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +540,10 @@ Please select whether you want to allow access.</source>
         <translation>複製のオプション</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>タイトルに &apos; - 複製&apos; を追加</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>ユーザー名とパスワードを参照で置き換える</translation>
     </message>
@@ -225,10 +551,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>履歴をコピー</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>タイトルに &apos; - 複製&apos; を追加</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +648,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>CSV ファイルをインポート</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>エラー</translation>
     </message>
@@ -340,17 +658,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>バイト、</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n バイト、</numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>行、</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n 行、</numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>列</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n 列</numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +690,14 @@ Please select whether you want to allow access.</source>
         <translation>参照</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>再読み込み</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>チャレンジレスポンス:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>データベースを開けませんでした。</translation>
     </message>
@@ -380,6 +706,24 @@ Please select whether you want to allow access.</source>
         <translation>キーファイルを開けませんでした</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation>レガシーなキーファイル形式</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>レガシーなキーファイル形式は、将来的に、
+サポートされなくなる可能性があります。
+
+新しいキーファイルの生成を検討してください。</translation>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>今後この警告を表示しない</translation>
+    </message>
+    <message>
         <source>All files</source>
         <translation>全てのファイル</translation>
     </message>
@@ -391,14 +735,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>キーファイルを選択</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>再読み込み</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>チャレンジレスポンス:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +751,14 @@ Please select whether you want to allow access.</source>
         <translation>キーファイルを開けませんでした</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>データベースは正常に開かれています。行うべきことはありません。</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>データベースを開けませんでした。</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>データベースは正常に開かれています。行うべきことはありません。</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>成功</translation>
     </message>
@@ -440,40 +776,61 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>データベース名:</translation>
+        <source>General</source>
+        <translation>一般</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>データベースの概要:</translation>
+        <source>Encryption</source>
+        <translation>暗号化</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>変換回数:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>ラウンド数が大きすぎます</translation>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>デフォルトのユーザー名:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation>Argon2 のキー変換ラウンド数に非常に大きな値を使用しています。
+
+この値を維持すると、データベースを開くのに数時間または数日 (もしくはそれ以上) かかる可能性があります。</translation>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation>理解した上で値を維持する</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>ベンチマーク</translation>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>最大履歴数:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>ラウンド数が小さすぎます</translation>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>最大履歴データサイズ:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation>AES-KDF のキー変換ラウンド数に非常に小さな値を使用しています。
+
+この値を維持すると、データベースが簡単にクラックされる可能性があります。</translation>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>ゴミ箱を使用する</translation>
+        <source>KDF unchanged</source>
+        <translation>KDF は変更されません</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>新しい KDF のパラメーターでのキー変換に失敗しました。KDF は変更されません。</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>暗号化アルゴリズム:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +841,78 @@ You can now save it.</source>
         <translation>Twofish: 256 ビット</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>アルゴリズム:</translation>
+        <source>Key Derivation Function:</source>
+        <translation>鍵導出関数:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>変換回数:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>メモリ使用量:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>並列処理:</translation>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation> スレッド</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>データベースのメタデータ</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>データベース名:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>データベースの概要:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>デフォルトのユーザー名:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>履歴の設定</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>最大履歴数:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>最大履歴データサイズ:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>ゴミ箱を使用する</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>ルート</translation>
     </message>
     <message>
@@ -511,22 +932,48 @@ You can now save it.</source>
         <translation>ファイルが見つかりません</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 データベースを開く</translation>
+        <source>Unable to open the database.</source>
+        <translation>データベースを開けませんでした。</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 データベース</translation>
+        <source>File opened in read only mode.</source>
+        <translation>読み取り専用でファイルを開きました。</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>CSV ファイルを開く</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV ファイル</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>全てのファイル (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>データベースをマージする</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 データベースを開く</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 データベース</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>閉じますか？</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; は現在編集モードです。
+変更を破棄して閉じてしまってもよろしいですか？</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>変更を保存しますか？</translation>
     </message>
@@ -538,15 +985,27 @@ Save changes?</source>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>データベースが保存できませんでした。</translation>
+        <translation>データベースの書き込みに失敗しました。</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>パスワード</translation>
     </message>
     <message>
         <source>Save database as</source>
-        <translation>データベースを別名で保存</translation>
+        <translation>ファイル名をつけてデータベースを保存</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>データベースを CSV ファイルにエクスポートする</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>CSV ファイルの書き込みに失敗しました。</translation>
     </message>
     <message>
         <source>New database</source>
-        <translation>新しいデータベース</translation>
+        <translation>新規データベース</translation>
     </message>
     <message>
         <source>locked</source>
@@ -563,12 +1022,6 @@ Please press cancel to finish your changes or discard them.</source>
 キャンセルボタンを押し、変更を完了させるか破棄してください。</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>このデータベースは一度も保存されていません。
-データベースを保存してロックを解除してください。</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,69 +1029,14 @@ Otherwise your changes are lost.</source>
 ロックを行う前にデータベースを保存しますか？
 保存しない場合には変更点は失われます。</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; は現在編集モードです。
-変更を破棄して閉じてしまってもよろしいですか？</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>データベースを CSV ファイルにエクスポートする</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV ファイル</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>CSV ファイルの書き込みに失敗しました。</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>データベースを開けませんでした。</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>データベースをマージする</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>保存しようとしたデータベースは KeePassXC の別インスタンスによってロックされています。
-強制的に保存しますか？</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>パスワード</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>データベースを既に開いています</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>開こうとしたデータベースは KeePassXC の別インスタンスによってロックされています。
-強制的に開きますか？</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>読み取り専用で開く</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>読み取り専用でファイルを開きました。</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>CSV ファイルを開く</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>検索中…</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>マスターキーを変更</translation>
     </message>
@@ -659,6 +1057,14 @@ Do you want to open it anyway?</source>
         <translation>本当に %1 個のエントリーを永久に削除しますか？</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>エントリーをゴミ箱に移動しますか？</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>本当にエントリー &quot;%1&quot; をゴミ箱に移動しますか？</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>エントリーをゴミ箱に移動しますか？</translation>
     </message>
@@ -667,28 +1073,28 @@ Do you want to open it anyway?</source>
         <translation><numerusform>本当に %n 個のエントリーをゴミ箱に移動しますか？</numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>グループを削除しますか？</translation>
+        <source>Execute command?</source>
+        <translation>コマンドを実行しますか？</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>本当にグループ &quot;%1&quot; を永久に削除しますか？</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>本当に次のコマンドを実行しますか？&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>マスターキーを計算できませんでした</translation>
+        <source>Remember my choice</source>
+        <translation>選択を記憶する</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>エントリーをゴミ箱に移動しますか？</translation>
+        <source>Delete group?</source>
+        <translation>グループを削除しますか？</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>本当にエントリー &quot;%1&quot; をゴミ箱に移動しますか？</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>本当にグループ &quot;%1&quot; を永久に削除しますか？</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>検索中…</translation>
+        <source>Unable to calculate master key</source>
+        <translation>マスターキーを計算できません</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1113,8 @@ Do you want to open it anyway?</source>
         <translation>見つかりません</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>コマンドを実行しますか？</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>本当に次のコマンドを実行しますか？&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>選択を記憶する</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>自動再読み込みリクエスト</translation>
+        <source>File has changed</source>
+        <translation>ファイルが変更されました</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1125,10 @@ Do you want to open it anyway?</source>
         <translation>マージリクエスト</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>データベースファイルが変更され、未保存の変更があります。変更をマージしますか？</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>データベースファイルが変更され、未保存の変更があります。
+変更をマージしますか？</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1144,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>TOTP トークンを生成</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>閉じる</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>有効期限</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ユーザー名</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>自動入力</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>検索</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>属性</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>添付ファイル</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>メモ</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>ウィンドウ</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>シーケンス</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>検索</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>消去</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>なし</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[保護]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>無効</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>有効</translation>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1253,30 @@ Do you want to open it anyway?</source>
         <translation>履歴</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH エージェント</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(暗号化)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>私有鍵を選択</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>ファイルが大きすぎるため私有鍵にできません</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>私有鍵を開くのに失敗しました</translation>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>エントリーの履歴</translation>
     </message>
@@ -794,22 +1297,20 @@ Do you want to open it anyway?</source>
         <translation>新しい属性</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>ファイルを選択</translation>
+        <source>Confirm Remove</source>
+        <translation>削除の確認</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>ファイルを開けませんでした</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>この属性を削除してもよろしいですか？</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>添付を保存</translation>
+        <source>[PROTECTED]</source>
+        <translation>[保護]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>添付を保存できませんでした:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation>表示または編集する場合は開示をクリックしてください</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1318,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n週間</numerusform></translation>
+        <translation><numerusform>%n 週間</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%nヶ月</numerusform></translation>
+        <translation><numerusform>%n ヶ月</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1年</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>削除の確認</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>この属性を削除してもよろしいですか？</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[保護] 表示または編集する場合は開示をクリックしてください</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>この添付を削除してもよろしいですか？</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1344,6 @@ Do you want to open it anyway?</source>
         <translation>削除</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>添付ファイル</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>保存</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>開く</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>名前を編集</translation>
     </message>
@@ -882,6 +1355,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>開示</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>添付ファイル</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1367,18 @@ Do you want to open it anyway?</source>
         <translation>このエントリーの自動入力を有効にする</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>自動入力シーケンスをグループから引き継ぐ(&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>カスタムした自動入力シーケンスを使用する(&amp;U):</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>ウィンドウの関連付け</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1391,6 @@ Do you want to open it anyway?</source>
         <translation>ウィンドウタイトル:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>自動入力シーケンスをグループから引き継ぐ(&amp;G)</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>カスタムした自動入力シーケンスを使用する(&amp;U):</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>デフォルトのシーケンスを使用する(&amp;Q)</translation>
     </message>
@@ -917,10 +1398,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>カスタムしたシーケンスを設定する(&amp;M):</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>ウィンドウの関連付け</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1421,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>タイトル:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>ユーザー名:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1433,104 @@ Do you want to open it anyway?</source>
         <translation>パスワード確認:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>タイトル:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>期限</translation>
+        <source>Notes</source>
+        <translation>メモ</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>プリセット</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>メモ:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>チェックボックスを切り替えるとメモを表示します。</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>ユーザー名:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>期限</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>次の時間が過ぎたらエージェントからキーを削除</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation> 秒</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>フィンガープリント</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>データベースが閉じられたりロックされた際にエージェントからキーを削除する</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>公開鍵</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>データベースが開かれたりロックが解除された際にエージェントにキーを追加する</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>コメント</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>復号</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>クリップボードにコピー</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>私有鍵</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>外部ファイル</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>参照...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>添付ファイル</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>エージェントに追加</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>エージェントから削除</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>このキーが使用される際にユーザーの確認を必要とする</translation>
     </message>
 </context>
 <context>
@@ -1015,7 +1572,7 @@ Do you want to open it anyway?</source>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
-        <translation>グループ名</translation>
+        <translation>名前</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1045,6 +1602,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>デフォルトアイコンから選択(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>カスタムアイコンから選択(&amp;M)</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>カスタムアイコンを追加</translation>
     </message>
@@ -1053,6 +1618,18 @@ Do you want to open it anyway?</source>
         <translation>カスタムアイコンを削除</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>ファビコンをダウンロード</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>ファビコンを取得できません。</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>ヒント: ツール &gt; 設定 &gt; セキュリティから Google をフォールバックとして有効にすることができます</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>画像</translation>
     </message>
@@ -1065,24 +1642,12 @@ Do you want to open it anyway?</source>
         <translation>画像を選択</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>ファビコンをダウンロード</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>ファビコンを取得できません。</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>アイコンを読み取ることができません</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>デフォルトアイコンから選択(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>カスタムアイコンから選択(&amp;M)</translation>
+        <source>Custom icon already exists</source>
+        <translation>カスタムアイコンは既に存在します</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1657,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>このアイコンは %1 個のエントリーで使用されており、デフォルトのアイコンに置き換えられます。本当に削除してもよろしいですか？</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>ヒント: ツール &gt; 設定 &gt; セキュリティから Google をフォールバックとして有効にすることができます</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>カスタムアイコンは既に存在します</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1681,99 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - 複製</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>サイズ</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>追加</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>開く</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>保存</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>ファイルを選択</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>%n 個の添付を削除してもよろしいですか？</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>削除の確認</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>添付を保存</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>ディレクトリを作成できませんでした:
+%1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>既存のファイル &quot;%1&quot; を上書きしてもよろしいですか？</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>上書きの確認</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>添付を保存できませんでした:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>添付を開けませんでした:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>添付を開けませんでした:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>ファイルを開けませんでした:
+%1</translation>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1802,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>参照:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>グループ</translation>
     </message>
@@ -1171,11 +1822,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>参照:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1831,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: ファイルを保存できません</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Native messaging スクリプトファイルを保存できません。</translation>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1904,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>マスターキーを計算できません</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>チャレンジレスポンスを発行することができません。</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>キーが間違っているかデータベースファイルが破損しています。</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>チャレンジレスポンスを発行することができません。</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>マスターキーを計算できません</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>データベースのヘッダーがありません</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>マスターキーを計算できません</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>ヘッダーのチェックサムのサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>ヘッダー SHA256 が一致しません</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>キーが間違っているかデータベースファイルが破損しています (HMAC の不一致)。</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>不明な暗号です</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation>ヘッダー ID サイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation>ヘッダーフィールド長が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>ヘッダーデータ長が不正です</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation>ヘッダーの KDF パラメーターのバッファーを開くのに失敗しました</translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation>サポートしていない鍵導出関数 (KDF) または不正なパラメーターです</translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation>KDBX4 ファイル内にレガシーなヘッダーフィールドが見つかりました。</translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>内部ヘッダー ID サイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation>内部ヘッダーフィールド長が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation>内部ヘッダーバイナリーサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>サポートしていないバージョンの KeePass VariantMap です。</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap のエントリー名の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap のエントリー名データが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap のエントリー値の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap のエントリー値データが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap の Bool エントリー値の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap の Int32 エントリー値の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap の UInt32 エントリー値の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap の Int64 エントリー値の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap の UInt64 エントリー値の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap のエントリータイプが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>VariantMap のフィールドタイプのサイズが不正です</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation>対称暗号アルゴリズムが不正です。</translation>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>対称暗号の初期化ベクトルのサイズが不正です。</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>マスターキーを計算できません</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation>KDF パラメーター VariantMap のシリアル化に失敗しました</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation>暗号の UUID の長さが不正です</translation>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation>サポートしていない暗号です</translation>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>圧縮フラグの長さが不正です</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>サポートしていない圧縮アルゴリズムです</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation>Master Seed のサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Transform Seed のサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation>変換回数のサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation>StreamStartBytes のサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation>Random Stream ID のサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation>内部 Random Stream 暗号が不正です</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>KeePass データベースではありません。</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>選択されたファイルは古い KeePass 1 のデータベース (.kdb) です。
+
+データベース &gt; &apos;KeePass 1 データベースをインポート...&apos; をクリックすることでインポートできます。
+これは一方向の移行操作であり、インポートされたデータベースは古い KeePassX 0.4 のバージョンでは開くことはできません。</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation>サポートしていないバージョンの KeePass 2 データベースです。</translation>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>XML の構文解析エラー: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>ルートグループがありません</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation>アイコンの UUID またはデータがありません</translation>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation>カスタムデータの Key または Value がありません</translation>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation>グループ要素が複数あります</translation>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation>グループの UUID が NULL です</translation>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation>グループアイコン番号が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>EnableAutoType の値が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation>EnableSearching の値が不正です</translation>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>グループの UUID がありません</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation>DeletedObject の UUID が NULL です</translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation>DeletedObject の UUID または DeletionTime がありません</translation>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation>エントリーの UUID が NULL です</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation>エントリーアイコン番号が不正です</translation>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation>エントリーの UUID が見つかりません</translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>真偽値が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>日時が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>色が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation>色の RGB が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation>数値が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>UUID の値が不正です</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1276,140 +2288,181 @@ Do you want to open it anyway?</source>
         <translation>サポートしていないバージョンの KeePass データベースです。</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>グループの数が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation>エントリーの数が不正です</translation>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation>コンテンツハッシュサイズが無効です</translation>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation>Transform Seed のサイズが不正です</translation>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation>変換回数の数が不正です</translation>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>ルート</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>マスターキーを計算できませんでした</translation>
+        <translation>マスターキーを計算できません</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
         <translation>キーが間違っているかデータベースファイルが破損しています。</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>KeePass データベースではありません。</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>サポートしていないバージョンの KeePass データベースです。</translation>
+        <source>Invalid group field type number</source>
+        <translation>グループフィールドタイプの数が不正です</translation>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>キーが間違っているかデータベースファイルが破損しています。</translation>
+        <source>Invalid group field size</source>
+        <translation>グループフィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>マスターキーを計算できません</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>チャレンジレスポンスを発行することができません。</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>選択されたファイルは古い KeePass 1 のデータベース (.kdb) です。
-
-データベース &gt; &apos;KeePass 1 データベースをインポート...&apos; をクリックすることでインポートできます。
-これは一方向の移行操作であり、インポートされたデータベースは古い KeePassX 0.4 のバージョンでは開くことはできません。</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>チャレンジレスポンスを発行することができません。</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>マスターキーを計算できません</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>暗号化機能のテスト中に致命的なエラーが発生しました。</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - エラー</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>ロックファイルを作成できませんでした。シングルインスタンスモードは無効です。</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>KeePassXC の別インスタンスが既に起動しています。</translation>
+        <source>Invalid group field type</source>
+        <translation>グループフィールドのタイプが不正です</translation>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>既存のシングルインスタンスロックファイルは無効です。新しいインスタンスを起動します。</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>データベースを開く</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>データベースの設定</translation>
+        <source>Invalid entry field size</source>
+        <translation>エントリーフィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>ユーザー名をコピー</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>パスワードをコピー</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation>エントリーの UUID フィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>設定</translation>
+        <source>Invalid entry group id field size</source>
+        <translation>エントリーのグループ ID フィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>ツールバーを表示</translation>
+        <source>Invalid entry icon field size</source>
+        <translation>エントリーのアイコンフィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>読み取り専用</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation>エントリーの作成日時フィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>ウィンドウ切替</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation>エントリーの編集日時フィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 データベース</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation>エントリーの有効期限フィールドのサイズが不正です</translation>
     </message>
     <message>
-        <source>All files</source>
-        <translation>全てのファイル</translation>
+        <source>Invalid entry field type</source>
+        <translation>エントリーのフィールドタイプが不正です</translation>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>修復されたデータベースを保存する</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>既存のシングルインスタンスロックファイルは無効です。新しいインスタンスを起動します。</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>データベースの書き込みに失敗しました。</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>ロックファイルを作成できませんでした。シングルインスタンスモードは無効です。</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>KeePassXC の別インスタンスが既に起動しています。</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>暗号化機能のテスト中に致命的なエラーが発生しました。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - エラー</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>データベース(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>最近使用したデータベース(&amp;R)</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>インポート</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>ヘルプ(&amp;H)</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>エントリー(&amp;N)</translation>
     </message>
@@ -1418,12 +2471,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>クリップボードにコピー(&amp;R)</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>グループ(&amp;G)</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>表示(&amp;V)</translation>
+        <source>&amp;Tools</source>
+        <translation>ツール(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2491,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>このソフトウェアについて(&amp;A)</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>データベースを開く(&amp;O)...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>データベースを保存(&amp;S)</translation>
     </message>
@@ -1474,24 +2535,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>グループを削除(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>データベースの設定(&amp;D)</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>データベースを別名で保存(&amp;V)...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>エントリーを複製(&amp;C)</translation>
+        <source>Change &amp;master key...</source>
+        <translation>マスターキーを変更(&amp;M)...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>時限ワンタイムパスワード</translation>
+        <source>&amp;Database settings</source>
+        <translation>データベースの設定(&amp;D)</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>TOTP をコピー(&amp;T)</translation>
+        <source>Database settings</source>
+        <translation>データベースの設定</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>TOTP を表示</translation>
+        <source>&amp;Clone entry</source>
+        <translation>エントリーを複製(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2563,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>ユーザー名をコピー(&amp;U)</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>ユーザー名をコピー</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>パスワードをコピー(&amp;Y)</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>パスワードをコピー</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>設定(&amp;S)</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>パスワード生成</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>自動入力を実行(&amp;P)</translation>
     </message>
@@ -1526,165 +2599,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>タイトル(&amp;T)</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation>タイトルをコピー</translation>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>URL(&amp;U)</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation>URL をコピー</translation>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>メモ(&amp;N)</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>パスワード生成</translation>
+        <source>Copy notes to clipboard</source>
+        <translation>メモをコピー</translation>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>履歴を消去</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>CSV ファイルへエクスポート(&amp;E)...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>データベース(&amp;D)</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>KeePass 1 データベースをインポート...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>インポート</translation>
+        <source>Import CSV file...</source>
+        <translation>CSV ファイルをインポート...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>ツール(&amp;T)</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>データベースを修復(&amp;P)...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>TOTP を表示</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>TOTP の設定...</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>ゴミ箱を空にする</translation>
+        <source>Copy &amp;TOTP</source>
+        <translation>TOTP をコピー(&amp;T)</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>ゴミ箱を空にする(&amp;M)</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>履歴を消去</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>設定ファイル %1 へのアクセスエラー</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>KeePassXC を終了</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>YubiKey のボタンにタッチしてください</translation>
+        <source>read-only</source>
+        <translation>読み取り専用</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>ヘルプ(&amp;H)</translation>
+        <source>Settings</source>
+        <translation>設定</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>データベースを開く(&amp;O)...</translation>
+        <source>Toggle window</source>
+        <translation>ウィンドウ切替</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>データベースを別名で保存(&amp;V)...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>KeePassXC を終了</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>マスターキーを変更(&amp;M)...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 データベース</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>CSV ファイルへエクスポート(&amp;E)...</translation>
+        <source>All files</source>
+        <translation>全てのファイル</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1 データベースをインポート...</translation>
+        <source>Open database</source>
+        <translation>データベースを開く</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>CSV ファイルをインポート...</translation>
+        <source>Save repaired database</source>
+        <translation>修復されたデータベースを保存する</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>データベースを修復(&amp;P)...</translation>
+        <source>Writing the database failed.</source>
+        <translation>データベースの書き込みに失敗しました。</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>TOTP の設定...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>YubiKey のボタンにタッチしてください</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>ダイアログ</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>OpenSSH の鍵ファイルではありません</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>クレデンシャルを要求された際に通知を表示する(&amp;O)</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>マッチするエントリーをユーザー名で並べ替える(&amp;U)</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>アクティブなデータベースのエントリーに保存されたアクセス許可をすべて削除する(&amp;M)</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>詳細設定</translation>
+        <source>Key file magic header id invalid</source>
+        <translation>キーファイルのマジックヘッダー ID が不正です</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>常にエントリーへのアクセスを許可する(&amp;A)</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>常にエントリーの更新を許可する(&amp;U)</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>すべての開かれたデータベースからマッチするエントリーを検索する(&amp;H)</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP ポート:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>デフォルトのポート: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>データベースがロックされている場合はロックの解除を要求する(&amp;Q)</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>マッチするエントリーをタイトルで並べ替える(&amp;M)</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC は 127.0.0.1 のこのポートをリッスンします</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>特権ポートにバインドできません</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>1024 以下の特権ポートにバインドできません。
-デフォルトのポート 19455 を使用します。</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>アクティブなデータベースから共有暗号化キーをすべて削除する(&amp;E)</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&quot;KPH: &quot; から始まる拡張された文字列フィールドを返す(&amp;R)</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>文字列フィールドの自動作成や自動更新はサポートされていません。</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>ダイアログ</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1695,14 +2813,27 @@ Using default port 19455.</source>
         <translation>KeePassHTTP サーバーを有効にする</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>クレデンシャルを要求された際に通知を表示する(&amp;O)</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>ドメイン全体にマッチするすべてのエントリーの代わりに、特定の URL に最もマッチするエントリーのみが返されます。</translation>
+        <translation>ドメイン全体にマッチする全てのエントリーの代わりに、特定の URL に最もマッチするエントリーのみが返されます。</translation>
     </message>
     <message>
         <source>&amp;Return only best matching entries</source>
         <translation>最もマッチするエントリーのみを返す(&amp;R)</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>データベースがロックされている場合はロックの解除を要求する(&amp;Q)</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>同じスキーム (http://, https://, ftp://, ...) を持つエントリーのみが返されます。</translation>
     </message>
@@ -1711,27 +2842,108 @@ Using default port 19455.</source>
         <translation>URL スキームのマッチ(&amp;M)</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>マッチするエントリーをユーザー名で並べ替える(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>マッチするエントリーをタイトルで並べ替える(&amp;M)</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>アクティブなデータベースから共有暗号化キーを全て削除する(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>アクティブなデータベースのエントリーに保存されたアクセス許可を全て削除する(&amp;M)</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>パスワード生成</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>詳細設定</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>常にエントリーへのアクセスを許可する(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>常にエントリーの更新を許可する(&amp;U)</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>選択されたデータベースのみがクライアントと接続する必要があります。</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>以下は危険なオプションです。
-設定の内容を理解している場合にのみ、変更を行ってください。</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>全ての開かれたデータベースからマッチするエントリーを検索する(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>文字列フィールドの自動作成や自動更新はサポートされていません。</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&quot;KPH: &quot; から始まる拡張された文字列フィールドを返す(&amp;R)</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP ポート:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>デフォルトのポート: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC は 127.0.0.1 のこのポートをリッスンします</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;警告:&lt;/b&gt; 以下は危険なオプションです。</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>特権ポートにバインドできません</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>1024 以下の特権ポートにバインドできません。
+デフォルトのポート 19455 を使用します。</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>パスワード:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>強度</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>エントロピー</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>文字種</translation>
     </message>
@@ -1752,38 +2964,50 @@ Change them only if you know what you are doing.</source>
         <translation>特殊な文字</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>拡張 ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>よく似た文字を除外する</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>適用</translation>
+        <source>Pick characters from every group</source>
+        <translation>全ての使用する文字種から文字を選ぶ</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>長さ(&amp;L):</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>強度</translation>
+        <source>Passphrase</source>
+        <translation>パスフレーズ</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>エントロピー</translation>
+        <source>Wordlist:</source>
+        <translation>単語リスト:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>長さ(&amp;L):</translation>
+        <source>Word Count:</source>
+        <translation>単語数:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>すべての使用する文字種から文字を選ぶ</translation>
+        <source>Word Separator:</source>
+        <translation>単語の区切り文字:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>生成</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>適用</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>閉じる</translation>
     </message>
@@ -1801,51 +3025,273 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>貧弱</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>弱い</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>良い</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>すばらしい</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>パスワード</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>拡張 ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>パスフレーズ</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>単語リスト:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>単語数:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>単語の区切り文字:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>コピー</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>データベースのパス。</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>パス</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>エントリーのユーザー名。</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>ユーザー名</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>エントリーの URL。</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation>エントリーのパスワードを要求する。</translation>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation>エントリーのパスワードを生成する。</translation>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation>生成するパスワードの長さ。</translation>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>長さ</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>追加するエントリーのパス。</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>クリップするエントリーのパス。</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>クリップボードを消去するまでの時間 (秒)</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>エントリーのタイトル。</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>タイトル</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>データベースの内容を展開して出力する。</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>展開するデータベースのパス。</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>警告: レガシーなキーファイル形式は、将来的に、
+サポートされなくなる可能性があります。
+
+新しいキーファイルの生成を検討してください。</translation>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>実行するコマンドの名前。</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>データベースのエントリーのリストを表示する。</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>リストを表示するグループのパス。デフォルトは / (ルート)</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>2つのデータベースをマージする。</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>マージ先のデータベースのパス。</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>マージ元のデータベースのパス。</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>両方のデータベースファイルに対して同一のクレデンシャルを使用する。</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>マージ元のデータベースのキーファイル。</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>表示するエントリーの名前。</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL デバイス</translation>
@@ -1868,8 +3314,28 @@ Change them only if you know what you are doing.</source>
         <translation>閉じ引用符がありません</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>INTERNAL - unget が下限を超過しました</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1888,14 +3354,22 @@ Change them only if you know what you are doing.</source>
         <translation>パスワード</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>メモ</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>最終更新日時</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>作成日時</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>ブラウザ統合</translation>
     </message>
@@ -1911,6 +3385,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>Passive</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH エージェント</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1949,8 +3427,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>大文字と小文字の区別</translation>
+        <source>Search...</source>
+        <translation>検索...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1961,8 +3439,8 @@ Change them only if you know what you are doing.</source>
         <translation>消去</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>検索...</translation>
+        <source>Case Sensitive</source>
+        <translation>大文字と小文字の区別</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1972,50 +3450,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>共有暗号化キー &quot;%1&quot; は既に存在します。
-上書きしますか？</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>%1 - %2 の情報を更新しますか？</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>アクティブなデータベースがロックされています。
-選択されたデータベースのロックを解除するか、別のロックされていないデータベースを選択してください。</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>KeePassX/Http の設定から %1 個の暗号化%2が無事に削除されました。</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp の設定内に共有暗号化キーは見つかりませんでした。</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>アクティブなデータベースに KeePassHttp の設定のエントリーが含まれていません。</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>保存されたアクセス許可を削除しています…</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>中止</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>%1 個の%2から無事にアクセス許可が削除されました。</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>アクティブなデータベースにはアクセス許可があるエントリーは含まれていません。</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: 新しいキーのアソシエーション要求</translation>
     </message>
@@ -2032,33 +3466,77 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
         <translation>KeePassXC: 既存のキーを上書きしますか？</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>共有暗号化キー &quot;%1&quot; は既に存在します。
+上書きしますか？</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: エントリーを更新</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>%1 - %2 の情報を更新しますか？</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: データベースはロックされています</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>アクティブなデータベースがロックされています。
+選択されたデータベースのロックを解除するか、別のロックされていないデータベースを選択してください。</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: データベースからキーが削除されました</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation><numerusform>KeePassX/Http の設定から %n 個の暗号化キーが無事に削除されました。</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: キーが見つかりません</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>KeePassHttp の設定内に共有暗号化キーは見つかりませんでした。</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: 設定は利用できません</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>アクティブなデータベースに KeePassHttp の設定のエントリーが含まれていません。</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>保存されたアクセス許可を削除しています…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: アクセス許可が削除されました</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation><numerusform>%n 個のエントリーから無事にアクセス許可が削除されました。</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: アクセス許可があるエントリーは見つかりません</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>アクティブなデータベースにはアクセス許可があるエントリーは含まれていません。</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2082,10 +3560,26 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>基本設定</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>KeePassXC のインスタンスを一つだけ起動する</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>最近使用したデータベースを記憶する</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>最近使用したキーファイルとセキュリティードングルを記憶する</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>起動時に前回のデータベースを読み込む</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>終了時に自動的に保存する</translation>
     </message>
@@ -2094,20 +3588,28 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
         <translation>変更するたびに自動的に保存する</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>編集された際に自動でデータベースを再読み込みする</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>クリップボードにコピーしたら最小化する</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>アプリケーション起動時にウィンドウを最小化する</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>エントリー作成時にグループのアイコンを使用する</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>グローバル自動入力のショートカット</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>データ以外の変更（例えばグループの展開）に対して、データベースを修正済みとしてマークしないようにする</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>言語</translation>
+        <source>Hide the Details view</source>
+        <translation>詳細を非表示にする</translation>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2118,66 +3620,60 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
         <translation>最小化された際にシステムトレイへ格納する</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>起動時に前回のデータベースを読み込む</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>編集された際に自動でデータベースを再読み込みする</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>アプリケーション終了ではなくシステムトレイへ格納する</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>アプリケーション起動時にウィンドウを最小化する</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>基本設定</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>最近使用したキーファイルとセキュリティードングルを記憶する</translation>
+        <source>Dark system tray icon</source>
+        <translation>ダークシステムトレイアイコン</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>データ以外の変更（例えばグループの展開）に対して、データベースを修正済みとしてマークしないようにする</translation>
+        <source>Language</source>
+        <translation>言語</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>自動入力</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>グローバル自動入力のウィンドウの照合にエントリーのタイトルと URL を使用する</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>グローバル自動入力の際に、エントリーのタイトルとウィンドウのマッチングを行う</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>グローバル自動入力のウィンドウの照合にエントリーの URL を使用する</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>自動入力を行う前に毎回確認する</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>グローバル自動入力のショートカット</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>自動入力の遅延</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>ミリ秒</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>KeePassXC のインスタンスを一つだけ起動する</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>タイムアウト</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>次の時間が過ぎたらクリップボードを消去</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>秒</translation>
     </message>
     <message>
@@ -2185,8 +3681,12 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
         <translation>未操作の時間が続いたらデータベースをロック</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>パスワードはデフォルトで平文表示にする</translation>
+        <source>Convenience</source>
+        <translation>利便性</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>セッションがロックされたりラップトップが閉じられた際にデータベースをロックする</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2197,16 +3697,16 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
         <translation>パスワードが表示されている場合は、パスワードの再入力を必要としないようにする</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>タイムアウト</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>パスワードはデフォルトで平文表示にする</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>利便性</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation>プレビューパネルではパスワードを非表示にする</translation>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>セッションがロックされたりラップトップが閉じられた際にデータベースをロックする</translation>
+        <source>Hide entry notes by default</source>
+        <translation>エントリーのメモはデフォルトで非表示にする</translation>
     </message>
     <message>
         <source>Privacy</source>
@@ -2228,6 +3728,14 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
         <translation>キー:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>カスタム設定を使用する</translation>
     </message>
@@ -2253,6 +3761,7 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>秒</translation>
     </message>
 </context>
@@ -2320,88 +3829,40 @@ KeePassXC のデータベースへのアクセスを許可したい場合は、
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>カスタム設定ファイルへのパス</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>データベースのキーファイル</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - クロスプラットフォームのパスワードマネージャー</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>標準入力からデータベースのパスワードを読み込む</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>開くパスワードデータベースのファイル名 (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>クリップボードにパスワードをコピーする</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>データベースのパス。</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>データベースのロックを解除する際に GUI プロンプトを使用する。</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>クリップするエントリーの名前。</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>データベースの内容を展開して出力する。</translation>
+        <source>Path of the entry to remove.</source>
+        <translation>削除するエントリーのパス。</translation>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
-        <translation>展開するデータベースのパス。</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>実行するコマンドの名前。</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>データベースのエントリーのリストを表示する。</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>リストを表示するグループのパス。デフォルトは / (ルート)</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>エントリーとグループの UUID を出力する。</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>2つのデータベースをマージする。</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - クロスプラットフォームのパスワードマネージャー</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>マージ先のデータベースのパス。</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>開くパスワードデータベースのファイル名 (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>マージ元のデータベースのパス。</translation>
+        <source>path to a custom config file</source>
+        <translation>カスタム設定ファイルへのパス</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>両方のデータベースファイルに対して同一のパスワードを使用する。</translation>
+        <source>key file of the database</source>
+        <translation>データベースのキーファイル</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>パスワードを表示する。</translation>
+        <source>read password of the database from stdin</source>
+        <translation>標準入力からデータベースのパスワードを読み込む</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>表示するエントリーの名前。</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ko.ts b/share/translations/keepassx_ko.ts
index 9b00bbc2f..bcfb1a27e 100644
--- a/share/translations/keepassx_ko.ts
+++ b/share/translations/keepassx_ko.ts
@@ -10,14 +10,34 @@
         <translation>정보</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation> &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt; 사이트에 버그를 보고해 주십시오</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC는 GNU 일반 공중 라이선스(GPL) 버전 2 및 (선택적으로) 버전 3으로 배포됩니다.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>프로젝트 관리자:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>기여자</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;GitHub에서 기여자 보기&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>디버그 정보</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>버그를 보고할 때 다음 정보를 포함하십시오:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>클립보드에 복사</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>리비전: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>배포판: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>라이브러리:</translation>
     </message>
@@ -47,34 +71,14 @@ CPU 아키텍처: %2
         <source>Enabled extensions:</source>
         <translation>활성화된 확장 기능:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation> &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt; 사이트에 버그를 보고해 주십시오</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC는 GNU 일반 공중 라이선스(GPL) 버전 2 및 (선택적으로) 버전 3으로 배포됩니다.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>프로젝트 관리자:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;GitHub에서 기여자 보기&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>버그를 보고할 때 다음 정보를 포함하십시오:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>배포판: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP 접근 확인</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>이 선택 기억하기</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1에서 다음 항목의 암호를 요청했습니다.
 접근을 허용할 지 여부를 선택하십시오.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP 접근 확인</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>자동 입력 - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>자동 입력</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>자동 입력 - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>자동으로 입력할 항목 선택:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>자동 입력 - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>이 선택 기억하기</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>허용</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>거부</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1에서 다음 항목의 암호를 요청했습니다.
+접근을 허용할 지 여부를 선택하십시오.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>대화 상자</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>데이터베이스가 잠겼을 때 잠금 해제 요청(&amp;Q)</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>도메인이 일치하는 모든 항목 대신 지정한 URL과 일치하는 항목만 반환합니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>고급</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>선택한 데이터베이스만 클라이언트와 연결할 수 있습니다.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>문자열 필드를 자동으로 만들거나 업데이트하는 것은 지원되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&quot;KPH: &quot;로 시작하는 고급 문자열 필드 반환(&amp;R)</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: 새 키 연결 요청</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: 기존 키를 덮어쓰시겠습니까?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: 항목 업데이트</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>%1 - %2의 정보를 업데이트하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: 데이터베이스 잠김!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>활성 데이터베이스가 잠겨 있습니다!
+선택한 데이터베이스의 잠금을 풀거나 잠금이 풀린 데이터베이스를 선택하십시오.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: 설정을 사용할 수 없음!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: 키를 찾을 수 없음</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: 데이터베이스에서 키 삭제됨</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>중지</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: 권한 삭제됨</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: 권한이 있는 항목을 찾을 수 없음!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>활성 데이터베이스에 권한이 부여된 항목이 없습니다.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Please select whether you want to allow access.</source>
         <translation>암호 확인:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>키 파일(&amp;K)</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>찾아보기</translation>
     </message>
@@ -157,6 +465,14 @@ Please select whether you want to allow access.</source>
         <translation>만들기</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>질의 응답(&amp;L)</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>새로 고침</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>키 파일</translation>
     </message>
@@ -177,6 +493,10 @@ Please select whether you want to allow access.</source>
         <translation>키 파일 선택</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>빈 암호</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>빈 문자열을 암호로 사용하시겠습니까?</translation>
     </message>
@@ -190,20 +510,15 @@ Please select whether you want to allow access.</source>
         <translation>%1을(를) 키 파일로 설정할 수 없습니다: %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>키 파일(&amp;K)</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>질의 응답(&amp;L)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>새로 고침</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>빈 암호</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -217,6 +532,10 @@ Please select whether you want to allow access.</source>
         <translation>복제 옵션</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>제목에 &apos; - 사본&apos; 추가</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>사용자 이름과 암호를 참조로 대체</translation>
     </message>
@@ -224,10 +543,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>과거 기록 복사</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>제목에 &apos; - 사본&apos; 추가</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -325,10 +640,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>CSV 파일 가져오기</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>오류</translation>
     </message>
@@ -339,17 +650,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>바이트, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>줄, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>칸</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -371,6 +682,14 @@ Please select whether you want to allow access.</source>
         <translation>찾아보기</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>새로 고침</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>질의 응답:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>데이터베이스를 열 수 없습니다.</translation>
     </message>
@@ -379,6 +698,21 @@ Please select whether you want to allow access.</source>
         <translation>키 파일을 열 수 없음</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>모든 파일</translation>
     </message>
@@ -390,14 +724,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>키 파일 선택</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>새로 고침</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>질의 응답:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -414,14 +740,14 @@ Please select whether you want to allow access.</source>
         <translation>키 파일을 열 수 없음</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>데이터베이스를 열었습니다. 할 일이 없습니다.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>데이터베이스를 열 수 없습니다.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>데이터베이스를 열었습니다. 할 일이 없습니다.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>성공</translation>
     </message>
@@ -439,40 +765,57 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>데이터베이스 이름:</translation>
+        <source>General</source>
+        <translation>일반</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>데이터베이스 설명:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>변환 횟수:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>기본 사용자 이름:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>벤치마크</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>최대 과거 항목 수:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>최대 과거 항목 크기:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>휴지통 사용</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -483,14 +826,78 @@ You can now save it.</source>
         <translation>Twofish: 256비트</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>알고리즘:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>변환 횟수:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>데이터베이스 이름:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>데이터베이스 설명:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>기본 사용자 이름:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>최대 과거 항목 수:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>최대 과거 항목 크기:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>휴지통 사용</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>루트</translation>
     </message>
     <message>
@@ -510,22 +917,48 @@ You can now save it.</source>
         <translation>파일을 찾을 수 없습니다!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 데이터베이스 열기</translation>
+        <source>Unable to open the database.</source>
+        <translation>데이터베이스를 열 수 없습니다.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 데이터베이스</translation>
+        <source>File opened in read only mode.</source>
+        <translation>파일을 읽기 전용 모드로 열었습니다.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>CSV 파일 열기</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV 파일</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>모든 파일 (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>데이터베이스 합치기</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 데이터베이스 열기</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 데이터베이스</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>닫기 확인?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot;이(가) 현재 편집 모드입니다.
+변경 사항을 무시하고 닫으시겠습니까?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>변경 사항 저장 확인?</translation>
     </message>
@@ -539,10 +972,22 @@ Save changes?</source>
         <translation>데이터베이스에 쓸 수 없습니다.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>암호</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>다른 이름으로 데이터베이스 저장</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>데이터베이스를 CSV 파일로 내보내기</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>CSV 파일에 기록할 수 없습니다.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>새 데이터베이스</translation>
     </message>
@@ -561,12 +1006,6 @@ Please press cancel to finish your changes or discard them.</source>
 취소를 눌러서 변경 사항을 저장하거나 무시하십시오.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>이 데이터베이스가 저장되지 않았습니다.
-데이터베이스를 저장하거나 잠금을 풀 수 있습니다.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -574,70 +1013,14 @@ Otherwise your changes are lost.</source>
 잠그기 전에 데이터베이스를 저장하시겠습니까?
 저장하지 않은 변경 사항은 손실됩니다.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot;이(가) 현재 편집 모드입니다.
-변경 사항을 무시하고 닫으시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>데이터베이스를 CSV 파일로 내보내기</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV 파일</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>CSV 파일에 기록할 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>데이터베이스를 열 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>데이터베이스 합치기</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>저장하려는 데이터베이스를 다른 KeePassXC 인스턴스에서 잠갔습니다.
-그래도 저장하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>암호</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>데이터베이스가 이미 열림</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>열려는 데이터베이스를 다른 KeePassXC 인스턴스에서 잠갔습니다.
-
-그래도 여시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>읽기 전용으로 열기</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>파일을 읽기 전용 모드로 열었습니다.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>CSV 파일 열기</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>찾는 중...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>마스터 키 변경</translation>
     </message>
@@ -658,36 +1041,44 @@ Do you want to open it anyway?</source>
         <translation>정말 항목 %1개를 삭제하시겠습니까?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>항목을 휴지통으로 이동하시겠습니까?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>항목 &quot;%1&quot;을(를) 휴지통으로 이동하시겠습니까?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>항목을 휴지통으로 이동하시겠습니까?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>항목 %n개를 휴지통으로 이동하시겠습니까?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>그룹을 삭제하시겠습니까?</translation>
+        <source>Execute command?</source>
+        <translation>명령을 실행하시겠습니까?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>정말 그룹 &quot;%1&quot;을(를) 삭제하시겠습니까?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>다음 명령을 실행하시겠습니까?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>마스터 키를 계산할 수 없음</translation>
+        <source>Remember my choice</source>
+        <translation>이 선택 기억하기</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>항목을 휴지통으로 이동하시겠습니까?</translation>
+        <source>Delete group?</source>
+        <translation>그룹을 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>항목 &quot;%1&quot;을(를) 휴지통으로 이동하시겠습니까?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>정말 그룹 &quot;%1&quot;을(를) 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>찾는 중...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>마스터 키를 계산할 수 없습니다</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -706,20 +1097,8 @@ Do you want to open it anyway?</source>
         <translation>결과 없음</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>명령을 실행하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>다음 명령을 실행하시겠습니까?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>이 선택 기억하기</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>요청 자동으로 새로 고침</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -730,8 +1109,9 @@ Do you want to open it anyway?</source>
         <translation>요청 합치기</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>데이터베이스 파일이 변경되었고 저장하지 않은 변경 사항이 있습니다. 변경 사항을 합치겠습니까?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -747,6 +1127,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>닫기</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>암호</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>사용자 이름</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>첨부</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>메모</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>창</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>시퀀스</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>찾기</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>비우기</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -773,6 +1236,30 @@ Do you want to open it anyway?</source>
         <translation>과거 기록</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>항목 과거 기록</translation>
     </message>
@@ -793,21 +1280,20 @@ Do you want to open it anyway?</source>
         <translation>새 속성</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>파일 선택</translation>
+        <source>Confirm Remove</source>
+        <translation>삭제 확인</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>파일을 열 수 없습니다</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>이 속성을 삭제하시겠습니까?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>첨부 항목 저장</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>첨부 항목을 저장할 수 없습니다:</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -815,32 +1301,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n주</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n개월</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1년</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>삭제 확인</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>이 속성을 삭제하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[보호됨] 보거나 편집하려면 누르십시오</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>이 첨부 항목을 삭제하시겠습니까?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -857,18 +1327,6 @@ Do you want to open it anyway?</source>
         <translation>삭제</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>첨부</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>저장</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>열기</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>이름 편집</translation>
     </message>
@@ -880,6 +1338,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>보이기</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>첨부</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -888,6 +1350,18 @@ Do you want to open it anyway?</source>
         <translation>이 항목 자동 입력 사용</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>그룹의 기본 자동 입력 시퀀스 사용(&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>사용자 정의 자동 입력 시퀀스 사용(&amp;U):</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>창 연결</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -900,14 +1374,6 @@ Do you want to open it anyway?</source>
         <translation>창 제목:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>그룹의 기본 자동 입력 시퀀스 사용(&amp;G)</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>사용자 정의 자동 입력 시퀀스 사용(&amp;U):</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>기본 시퀀스 사용(&amp;Q)</translation>
     </message>
@@ -915,10 +1381,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>사용자 정의 시퀀스 설정(&amp;M):</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>창 연결</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -942,12 +1404,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>제목:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>사용자 이름:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -958,20 +1416,104 @@ Do you want to open it anyway?</source>
         <translation>암호 확인:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>제목:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>만료 기간</translation>
+        <source>Notes</source>
+        <translation>메모</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>사전 설정</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>메모:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>사용자 이름:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>만료 기간</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>클립보드에 복사</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1043,6 +1585,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>기본 아이콘 사용(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>사용자 정의 아이콘 사용(&amp;M)</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>사용자 정의 아이콘 추가</translation>
     </message>
@@ -1051,6 +1601,18 @@ Do you want to open it anyway?</source>
         <translation>사용자 정의 아이콘 삭제</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>파비콘 다운로드</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>파비콘을 다운로드할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>힌트: 도구 &gt; 설정 &gt; 보안에서 Google을 대체 항목으로 사용할 수 있습니다</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>그림</translation>
     </message>
@@ -1063,24 +1625,12 @@ Do you want to open it anyway?</source>
         <translation>그림 선택</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>파비콘 다운로드</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>파비콘을 다운로드할 수 없습니다.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>아이콘을 읽을 수 없음</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>기본 아이콘 사용(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>사용자 정의 아이콘 사용(&amp;M)</translation>
+        <source>Custom icon already exists</source>
+        <translation>사용자 정의 아이콘이 이미 존재함</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1090,14 +1640,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>이 아이콘을 항목 %1개에서 사용하고 있으며, 삭제 시 기본 아이콘으로 대체됩니다. 그래도 삭제하시겠습니까?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>힌트: 도구 &gt; 설정 &gt; 보안에서 Google을 대체 항목으로 사용할 수 있습니다</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>사용자 정의 아이콘이 이미 존재함</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1122,10 +1664,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - 사본</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>이름</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>추가</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>삭제</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>열기</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>저장</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>삭제 확인</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1154,6 +1780,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>참조: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>그룹</translation>
     </message>
@@ -1169,11 +1800,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>참조: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1183,6 +1809,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1245,6 +1882,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>마스터 키를 계산할 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>질의 응답을 실행할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>키가 잘못되었거나 데이터베이스가 손상되었습니다.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>질의 응답을 실행할 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>마스터 키를 계산할 수 없습니다</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>마스터 키를 계산할 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>마스터 키를 계산할 수 없습니다</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>KeePass 데이터베이스가 아닙니다.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>선택한 파일은 KeePass 1 데이터베이스(.kdb)입니다.
+
+데이터베이스 &gt; &apos;KeePass 1 데이터베이스 가져오기...&apos; 메뉴에서 항목을 가져올 수 있습니다.
+이 작업은 한 방향으로만 이뤄집니다. 가져온 데이터베이스는 KeePassX 0.4 버전에서 열 수 없습니다.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1274,140 +2266,181 @@ Do you want to open it anyway?</source>
         <translation>지원하지 않는 KeePass 데이터베이스 버전입니다.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>루트</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>마스터 키를 계산할 수 없음</translation>
+        <translation>마스터 키를 계산할 수 없습니다</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
         <translation>키가 잘못되었거나 데이터베이스가 손상되었습니다.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>KeePass 데이터베이스가 아닙니다.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>지원하지 않는 KeePass 데이터베이스 버전입니다.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>키가 잘못되었거나 데이터베이스가 손상되었습니다.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>마스터 키를 계산할 수 없습니다</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>질의 응답을 실행할 수 없습니다.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>선택한 파일은 KeePass 1 데이터베이스(.kdb)입니다.
-
-데이터베이스 &gt; &apos;KeePass 1 데이터베이스 가져오기...&apos; 메뉴에서 항목을 가져올 수 있습니다.
-이 작업은 한 방향으로만 이뤄집니다. 가져온 데이터베이스는 KeePassX 0.4 버전에서 열 수 없습니다.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>질의 응답을 실행할 수 없습니다.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>마스터 키를 계산할 수 없습니다</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>암호화 함수를 시험하는 중 오류가 발생하였습니다.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - 오류</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>잠금 파일을 만들 수 없습니다. 단일 인스턴스 모드가 비활성화되었습니다.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>다른 KeePassXC 인스턴스가 이미 실행 중입니다.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>존재하는 단일 인스턴스 잠금 파일이 잘못되었습니다. 새 인스턴스를 실행합니다.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>데이터베이스 열기</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>데이터베이스 설정</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>클립보드에 사용자 이름 복사</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>클립보드에 암호 복사</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>설정</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>도구 모음 보이기</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>읽기 전용</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>창 전환</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 데이터베이스</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>모든 파일</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>복구한 데이터베이스 저장</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>존재하는 단일 인스턴스 잠금 파일이 잘못되었습니다. 새 인스턴스를 실행합니다.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>데이터베이스에 쓸 수 없습니다.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>잠금 파일을 만들 수 없습니다. 단일 인스턴스 모드가 비활성화되었습니다.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>다른 KeePassXC 인스턴스가 이미 실행 중입니다.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>암호화 함수를 시험하는 중 오류가 발생하였습니다.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - 오류</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>데이터베이스(&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>최근 데이터베이스(&amp;R)</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>가져오기</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>도움말(&amp;H)</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>항목(&amp;N)</translation>
     </message>
@@ -1416,12 +2449,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>속성을 클립보드에 복사(&amp;R)</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>그룹(&amp;G)</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>보기(&amp;V)</translation>
+        <source>&amp;Tools</source>
+        <translation>도구(&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1432,6 +2469,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>정보(&amp;A)</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>데이터베이스 열기(&amp;O)...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>데이터베이스 저장(&amp;S)</translation>
     </message>
@@ -1472,24 +2513,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>그룹 삭제(&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>데이터베이스 설정(&amp;D)</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>다른 이름으로 데이터베이스 저장(&amp;V)...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>항목 복제(&amp;C)</translation>
+        <source>Change &amp;master key...</source>
+        <translation>마스터 키 변경(&amp;M)...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>시간 동기 일회용 암호</translation>
+        <source>&amp;Database settings</source>
+        <translation>데이터베이스 설정(&amp;D)</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>TOTP 복사(&amp;T)</translation>
+        <source>Database settings</source>
+        <translation>데이터베이스 설정</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>TOTP 보이기</translation>
+        <source>&amp;Clone entry</source>
+        <translation>항목 복제(&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1500,14 +2541,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>사용자 이름 복사(&amp;U)</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>클립보드에 사용자 이름 복사</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>암호 복사(&amp;Y)</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>클립보드에 암호 복사</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>설정(&amp;S)</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>암호 생성기</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>자동 입력 실행(&amp;P)</translation>
     </message>
@@ -1524,165 +2577,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>제목(&amp;T)</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>URL(&amp;U)</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>메모(&amp;N)</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>암호 생성기</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>과거 기록 삭제</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>CSV 파일로 내보내기(&amp;E)...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>데이터베이스(&amp;D)</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>KeePass1 데이터베이스 가져오기...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>가져오기</translation>
+        <source>Import CSV file...</source>
+        <translation>CSV 파일 가져오기...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>도구(&amp;T)</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>데이터베이스 복구(&amp;P)...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>TOTP 보이기</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>휴지통 비우기</translation>
+        <source>Set up TOTP...</source>
+        <translation>TOTP 설정...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>TOTP 복사(&amp;T)</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>과거 기록 삭제</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>설정 파일 %1에 접근할 수 없음</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>KeePassXC 끝내기</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>YubiKey의 단추를 누르십시오!</translation>
+        <source>read-only</source>
+        <translation>읽기 전용</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>도움말(&amp;H)</translation>
+        <source>Settings</source>
+        <translation>설정</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>데이터베이스 열기(&amp;O)...</translation>
+        <source>Toggle window</source>
+        <translation>창 전환</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>다른 이름으로 데이터베이스 저장(&amp;V)...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>KeePassXC 끝내기</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>마스터 키 변경(&amp;M)...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 데이터베이스</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>CSV 파일로 내보내기(&amp;E)...</translation>
+        <source>All files</source>
+        <translation>모든 파일</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass1 데이터베이스 가져오기...</translation>
+        <source>Open database</source>
+        <translation>데이터베이스 열기</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>CSV 파일 가져오기...</translation>
+        <source>Save repaired database</source>
+        <translation>복구한 데이터베이스 저장</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>데이터베이스 복구(&amp;P)...</translation>
+        <source>Writing the database failed.</source>
+        <translation>데이터베이스에 쓸 수 없습니다.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>TOTP 설정...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>YubiKey의 단추를 누르십시오!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>대화 상자</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>일반</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>인증 정보가 필요할 때 알림 표시(&amp;O)</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>사용자 이름 순으로 일치하는 항목 정렬(&amp;U)</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>활성 데이터베이스에 있는 항목에서 모든 저장된 권한 삭제(&amp;M)</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>고급</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>항상 항목 접근 허용(&amp;A)</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>항상 항목 업데이트 허용(&amp;U)</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>모든 열린 데이터베이스에서 일치하는 항목 검색(&amp;H)</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP 포트:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>기본 포트: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>데이터베이스가 잠겼을 때 잠금 해제 요청(&amp;Q)</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>제목 순으로 일치하는 항목 정렬(&amp;M)</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC는 127.0.0.1의 다음 포트에서 응답을 기다립니다</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>권한 있는 포트에 바인드할 수 없음</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>1024 이하의 권한이 필요한 포트에 바인드할 수 없습니다!
-기본 포트 19455를 사용합니다.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>활성 데이터베이스에 있는 모든 공유된 암호화 키 삭제(&amp;E)</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&quot;KPH: &quot;로 시작하는 고급 문자열 필드 반환(&amp;R)</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>문자열 필드를 자동으로 만들거나 업데이트하는 것은 지원되지 않습니다.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>대화 상자</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1693,6 +2791,15 @@ Using default port 19455.</source>
         <translation>KeePassHTTP 서버 사용</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>일반</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>인증 정보가 필요할 때 알림 표시(&amp;O)</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>도메인이 일치하는 모든 항목 대신 지정한 URL과 일치하는 항목만 반환합니다.</translation>
     </message>
@@ -1701,6 +2808,10 @@ Using default port 19455.</source>
         <translation>URL과 일치하는 항목만 반환(&amp;R)</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>데이터베이스가 잠겼을 때 잠금 해제 요청(&amp;Q)</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>같은 스키마(http://, https://, ftp://)를 사용하는 항목만 반환합니다.</translation>
     </message>
@@ -1709,27 +2820,108 @@ Using default port 19455.</source>
         <translation>URL 스키마 일치(&amp;M)</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>사용자 이름 순으로 일치하는 항목 정렬(&amp;U)</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>제목 순으로 일치하는 항목 정렬(&amp;M)</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>활성 데이터베이스에 있는 모든 공유된 암호화 키 삭제(&amp;E)</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>활성 데이터베이스에 있는 항목에서 모든 저장된 권한 삭제(&amp;M)</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>암호 생성기</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>고급</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>항상 항목 접근 허용(&amp;A)</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>항상 항목 업데이트 허용(&amp;U)</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>선택한 데이터베이스만 클라이언트와 연결할 수 있습니다.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>다음 옵션은 위험할 수도 있습니다!
-무엇을 하는 지 알고 있는 경우에만 변경하십시오.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>모든 열린 데이터베이스에서 일치하는 항목 검색(&amp;H)</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>문자열 필드를 자동으로 만들거나 업데이트하는 것은 지원되지 않습니다.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&quot;KPH: &quot;로 시작하는 고급 문자열 필드 반환(&amp;R)</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP 포트:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>기본 포트: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC는 127.0.0.1의 다음 포트에서 응답을 기다립니다</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>권한 있는 포트에 바인드할 수 없음</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>1024 이하의 권한이 필요한 포트에 바인드할 수 없습니다!
+기본 포트 19455를 사용합니다.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>암호:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>강도</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>엔트로피</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>암호</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>문자 종류</translation>
     </message>
@@ -1750,38 +2942,50 @@ Change them only if you know what you are doing.</source>
         <translation>특수 문자</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>확장 ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>비슷하게 생긴 문자 제외</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>사용</translation>
+        <source>Pick characters from every group</source>
+        <translation>모든 그룹에서 글자 선택</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>길이(&amp;L):</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>강도</translation>
+        <source>Passphrase</source>
+        <translation>암구호</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>엔트로피</translation>
+        <source>Wordlist:</source>
+        <translation>단어 목록:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>길이(&amp;L):</translation>
+        <source>Word Count:</source>
+        <translation>단어 개수:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>모든 그룹에서 글자 선택</translation>
+        <source>Word Separator:</source>
+        <translation>단어 구분자:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>생성</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>복사</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>사용</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>닫기</translation>
     </message>
@@ -1799,51 +3003,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>매우 약함</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>약함</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>좋음</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>매우 좋음</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>암호</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>확장 ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>암구호</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>단어 목록:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>단어 개수:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>단어 구분자:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>복사</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>데이터베이스의 경로입니다.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>데이터베이스의 내용을 추출하고 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>표시할 데이터베이스 경로입니다.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>실행할 명령 이름입니다.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>데이터베이스 항목을 표시합니다.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>표시할 그룹의 경로입니다. 기본값은 /입니다</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>두 데이터베이스를 합칩니다.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>합칠 대상 데이터베이스 경로입니다.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>합칠 원본 데이터베이스 경로입니다.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>표시할 항목 이름입니다.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL 장치</translation>
@@ -1867,8 +3290,28 @@ Change them only if you know what you are doing.</source>
         <translation>닫는 따옴표 없음</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>내부 - unget 최소값을 벗어남</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1887,14 +3330,22 @@ Change them only if you know what you are doing.</source>
         <translation>암호</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>메모</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>브라우저 통합</translation>
     </message>
@@ -1910,6 +3361,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>수동적</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1948,8 +3403,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>대소문자 구분</translation>
+        <source>Search...</source>
+        <translation>찾기...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1960,8 +3415,8 @@ Change them only if you know what you are doing.</source>
         <translation>비우기</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>찾기...</translation>
+        <source>Case Sensitive</source>
+        <translation>대소문자 구분</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1971,50 +3426,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>이름이 &quot;%1&quot;인 공유 암호화 키가 이미 있습니다.
-덮어쓰시겠습니까?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>%1 - %2의 정보를 업데이트하시겠습니까?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>활성 데이터베이스가 잠겨 있습니다!
-선택한 데이터베이스의 잠금을 풀거나 잠금이 풀린 데이터베이스를 선택하십시오.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>KeePassX/HTTP 설정에서 %1 암호화-%2을(를) 삭제했습니다.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp 설정에서 공유 암호화 키를 찾을 수 없습니다.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>활성 데이터베이스에 KeePassHttp 설정 항목이 없습니다.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>저장된 권한 삭제 중...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>중지</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>%1 %2에서 권한을 삭제했습니다.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>활성 데이터베이스에 권한이 부여된 항목이 없습니다.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: 새 키 연결 요청</translation>
     </message>
@@ -2031,33 +3442,77 @@ give it a unique name to identify and accept it.</source>
         <translation>KeePassXC: 기존 키를 덮어쓰시겠습니까?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>이름이 &quot;%1&quot;인 공유 암호화 키가 이미 있습니다.
+덮어쓰시겠습니까?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: 항목 업데이트</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>%1 - %2의 정보를 업데이트하시겠습니까?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: 데이터베이스 잠김!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>활성 데이터베이스가 잠겨 있습니다!
+선택한 데이터베이스의 잠금을 풀거나 잠금이 풀린 데이터베이스를 선택하십시오.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: 데이터베이스에서 키 삭제됨</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: 키를 찾을 수 없음</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>KeePassHttp 설정에서 공유 암호화 키를 찾을 수 없습니다.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: 설정을 사용할 수 없음!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>활성 데이터베이스에 KeePassHttp 설정 항목이 없습니다.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>저장된 권한 삭제 중...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>중지</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: 권한 삭제됨</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: 권한이 있는 항목을 찾을 수 없음!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>활성 데이터베이스에 권한이 부여된 항목이 없습니다.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2081,10 +3536,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>기본 설정</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>KeePassXC 단일 인스턴스만 사용</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>마지막 데이터베이스 기억</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>마지막 키 파일과 보안 동글 기억</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>시작할 때 이전 데이터베이스 불러오기</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>끝낼 때 자동 저장</translation>
     </message>
@@ -2093,20 +3564,28 @@ give it a unique name to identify and accept it.</source>
         <translation>항목을 변경할 때 자동 저장</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>외부에서 데이터베이스를 수정했을 때 자동으로 새로 고침</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>클립보드에 복사할 때 최소화</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>프로그램 시작 시 창 최소화</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>항목을 만들 때 그룹 아이콘 사용</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>전역 자동 입력 단축키</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>데이터가 변경되지 않았을 때 데이터베이스를 수정된 것으로 표시하지 않음(예: 그룹 확장)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>언어</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2117,66 +3596,60 @@ give it a unique name to identify and accept it.</source>
         <translation>시스템 트레이로 최소화</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>시작할 때 이전 데이터베이스 불러오기</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>외부에서 데이터베이스를 수정했을 때 자동으로 새로 고침</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>프로그램을 끝내지 않고 시스템 트레이로 창 숨기기</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>프로그램 시작 시 창 최소화</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>기본 설정</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>마지막 키 파일과 보안 동글 기억</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>데이터가 변경되지 않았을 때 데이터베이스를 수정된 것으로 표시하지 않음(예: 그룹 확장)</translation>
+        <source>Language</source>
+        <translation>언어</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>자동 입력</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>전역 자동 입력 창을 검사할 때 항목 제목과 URL 사용</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>자동 입력 시 항상 묻기</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>전역 자동 입력 단축키</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>자동 입력 지연 시간</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>KeePassXC 단일 인스턴스만 사용</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>시간 제한</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>다음 시간 이후 클립보드 비우기</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>초</translation>
     </message>
     <message>
@@ -2184,8 +3657,12 @@ give it a unique name to identify and accept it.</source>
         <translation>다음 시간 동안 활동이 없을 때 데이터베이스 잠금</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>기본값으로 암호를 평문으로 표시</translation>
+        <source>Convenience</source>
+        <translation>편의성</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>세션이 잠겼을 때나 덮개를 닫았을 때 데이터베이스 잠금</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2196,16 +3673,16 @@ give it a unique name to identify and accept it.</source>
         <translation>암호가 보일 때 반복하지 않음</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>시간 제한</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>기본값으로 암호를 평문으로 표시</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>편의성</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>세션이 잠겼을 때나 덮개를 닫았을 때 데이터베이스 잠금</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2227,6 +3704,14 @@ give it a unique name to identify and accept it.</source>
         <translation>키:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>사용자 정의 설정 사용</translation>
     </message>
@@ -2252,6 +3737,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>초</translation>
     </message>
 </context>
@@ -2319,88 +3805,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>사용자 정의 설정 파일 경로</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>데이터베이스 키 파일</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - 크로스 플랫폼 암호 관리자</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>표준 입력에서 데이터베이스 암호 읽기</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>열 암호 데이터베이스 파일 이름(*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>클립보드에 암호 복사</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>데이터베이스의 경로입니다.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>데이터베이스 잠금을 해제할 GUI 프롬프트를 표시합니다.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>클립보드에 복사할 항목 이름입니다.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>데이터베이스의 내용을 추출하고 표시합니다.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>표시할 데이터베이스 경로입니다.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>실행할 명령 이름입니다.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>데이터베이스 항목을 표시합니다.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>표시할 그룹의 경로입니다. 기본값은 /입니다</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>항목과 그룹의 UUID를 표시합니다.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>두 데이터베이스를 합칩니다.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - 크로스 플랫폼 암호 관리자</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>합칠 대상 데이터베이스 경로입니다.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>열 암호 데이터베이스 파일 이름(*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>합칠 원본 데이터베이스 경로입니다.</translation>
+        <source>path to a custom config file</source>
+        <translation>사용자 정의 설정 파일 경로</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>두 데이터베이스에 같은 암호를 사용합니다.</translation>
+        <source>key file of the database</source>
+        <translation>데이터베이스 키 파일</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>암호를 표시합니다.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>표준 입력에서 데이터베이스 암호 읽기</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>표시할 항목 이름입니다.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_lt.ts b/share/translations/keepassx_lt.ts
index a9a483836..37737035c 100644
--- a/share/translations/keepassx_lt.ts
+++ b/share/translations/keepassx_lt.ts
@@ -10,14 +10,34 @@
         <translation>Apie</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Apie klaidas praneškite adresu: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC yra platinama GNU Bendrosios Viešosios Licencijos (GPL) versijos 2 arba (jūsų pasirinkimu) versijos 3 sąlygomis.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Projektą prižiūri:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Talkininkai</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Žiūrėti talkinimus GitHub puslapyje&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Derinimo informacija</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Pranešdami apie klaidą, visuomet pateikite ir šią informaciją:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Kopijuoti į iškarpinę</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Poversijis: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Platinimas: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Bibliotekos:</translation>
     </message>
@@ -47,34 +71,14 @@ Branduolys: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Įjungti plėtiniai:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Apie klaidas praneškite adresu: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC yra platinama GNU Bendrosios Viešosios Licencijos (GPL) versijos 2 arba (jūsų pasirinkimu) versijos 3 sąlygomis.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Projektą prižiūri:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Žiūrėti talkinimus GitHub puslapyje&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Pranešdami apie klaidą, visuomet pateikite ir šią informaciją:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Platinimas: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP prieigos patvirtinimas</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Prisiminti šį sprendimą</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 užklausė prieigos prie slaptažodžių šiam elementui(-ams).
 Pasirinkite, ar norite leisti prieigą.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP prieigos patvirtinimas</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Automatinis rinkimas - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Automatinis rinkimas</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Pasirinkite, ar norite leisti prieigą.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Automatinis rinkimas - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Pasirinkite įrašą automatiniam rinkimui:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Automatinis rinkimas - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Prisiminti šį sprendimą</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Leisti</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Atmesti</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 užklausė prieigos prie slaptažodžių šiam elementui(-ams).
+Pasirinkite, ar norite leisti prieigą.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogas</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Bendra</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Už&amp;klausti atrakinti duomenų bazę, jeigu ji yra užrakinta</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Vietoj visos srities visų įrašų, grąžina tik geriausiai tam tikrą URL atitinkančius įrašus.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Išplėstiniai</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Su klientu turi būti sujungta tik pasirinkta duomenų bazė.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatinis eilutės laukų kūrimas ar atnaujinimas nėra palaikomas.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Grąžinti išplėstines eilutes, kurios prasideda &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Naršyti...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Vykdomieji failai (*.exe);;Visi failai (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Naujo rakto susiejimo užklausa</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Perrašyti esamą raktą?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Atnaujinti įrašą</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Ar norite atnaujinti informaciją ties %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Duomenų bazė užrakinta!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Aktyvi duomenų bazė yra užrakinta!
+Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų atrakinta.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Nustatymai neprieinami!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Raktų nerasta</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Pašalinti raktai iš duomenų bazės</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Nutraukti</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Pašalinti leidimai</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nerasta jokių įrašų su leidimais!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktyvioje duomenų bazėje nėra įrašo su leidimais.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Pakartokite slaptažodį:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Rakto failas</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Naršyti</translation>
     </message>
@@ -157,6 +465,14 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Kurti</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Iššū&amp;kio atsakymas</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Įkelti iš naujo</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Rakto failai</translation>
     </message>
@@ -177,6 +493,10 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Pasirinkite rakto failą</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Tuščias slaptažodis</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Ar tikrai norite naudoti tuščią eilutę kaip slaptažodį?</translation>
     </message>
@@ -191,20 +511,15 @@ Pasirinkite, ar norite leisti prieigą.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Rakto failas</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Iššū&amp;kio atsakymas</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Įkelti iš naujo</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Tuščias slaptažodis</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Dubliavimo parinktys</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Pridėti prie pavadinimo &quot; - Dublikatas&quot;</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Pakeisti naudotojo vardą ir slaptažodį nuorodomis</translation>
     </message>
@@ -225,10 +544,6 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <source>Copy history</source>
         <translation>Kopijuoti istoriją</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Pridėti prie pavadinimo &quot; - Dublikatas&quot;</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Pasirinkite, ar norite leisti prieigą.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importuoti CSV failą</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Klaida</translation>
     </message>
@@ -340,17 +651,17 @@ Pasirinkite, ar norite leisti prieigą.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> baitų, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> eilučių, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> stulpelių</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Naršyti</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Įkelti iš naujo</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Iššūkio atsakymas:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Nepavyko atverti duomenų bazės.</translation>
     </message>
@@ -380,6 +699,21 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Nepavyksta atverti rakto failo</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Daugiau neberodyti šio įspėjimo</translation>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Visi failai</translation>
     </message>
@@ -391,14 +725,6 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <source>Select key file</source>
         <translation>Pasirinkite rakto failą</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Įkelti iš naujo</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Iššūkio atsakymas:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Pasirinkite, ar norite leisti prieigą.</translation>
         <translation>Nepavyksta atverti rakto failo</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Duomenų bazė atsivėrė tvarkingai. Nėra ką atlikti.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Nepavyko atverti duomenų bazės.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Duomenų bazė atsivėrė tvarkingai. Nėra ką atlikti.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Pavyko</translation>
     </message>
@@ -440,40 +766,57 @@ Dabar galite ją įrašyti.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Duomenų bazės pavadinimas:</translation>
+        <source>General</source>
+        <translation>Bendra</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Duomenų bazės aprašas:</translation>
+        <source>Encryption</source>
+        <translation>Šifravimas</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Pasikeitimo ciklų:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Numatytasis naudotojo vardas:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Našumo testas</translation>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Daugiausia istorijos elementų:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Didžiausias istorijos dydis:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Naudoti šiukšlinę</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ Dabar galite ją įrašyti.</translation>
         <translation>Twofish:  256 Bitų</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmas:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Pasikeitimo ciklų:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Duomenų bazės pavadinimas:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Duomenų bazės aprašas:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Numatytasis naudotojo vardas:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Daugiausia istorijos elementų:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Didžiausias istorijos dydis:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Naudoti šiukšlinę</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Šaknis</translation>
     </message>
     <message>
@@ -511,22 +918,48 @@ Dabar galite ją įrašyti.</translation>
         <translation>Failas nerastas!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Atverkite KeePass 1 duomenų bazę</translation>
+        <source>Unable to open the database.</source>
+        <translation>Nepavyko atverti duomenų bazės.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 duomenų bazė</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Failas atvertas tik skaitymo veiksenoje.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Atverti CSV failą</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV failas</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Visi failai (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Sulieti duomenų bazę</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Atverkite KeePass 1 duomenų bazę</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 duomenų bazė</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Užverti?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; yra redagavimo veiksenoje.
+Vis tiek atmesti pakeitimus ir užverti?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Įrašyti pakeitimus?</translation>
     </message>
@@ -541,10 +974,22 @@ Save changes?</source>
         <translation>Duomenų bazės rašymas nepavyko.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Slaptažodžiai</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Įrašyti duomenų bazę kaip</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Eksportuoti duomenų bazę į CSV failą</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>CSV failo įrašymas nepavyko.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nauja duomenų bazė</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Spauskite atšaukti, kad užbaigtumėte savo pakeitimus arba juos atmestumėte.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Ši duomenų bazė niekada nebuvo įrašyta.
-Galite duomenų bazę įrašyti arba atsisakyti ją užrakinti.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,69 +1015,14 @@ Otherwise your changes are lost.</source>
 Ar prieš užrakinant, norite įrašyti duomenų bazę?
 Kitu atveju jūsų pakeitimai bus prarasti.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; yra redagavimo veiksenoje.
-Vis tiek atmesti pakeitimus ir užverti?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Eksportuoti duomenų bazę į CSV failą</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV failas</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>CSV failo įrašymas nepavyko.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Nepavyko atverti duomenų bazės.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Sulieti duomenų bazę</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Duomenų bazė, kurią bandote įrašyti yra užrakinta kito KeePassXC programos egzemplioriaus.
-Ar vis tiek norite ją įrašyti?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Slaptažodžiai</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Duomenų bazė jau atverta</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Duomenų bazė, kurią bandote atverti yra užrakinta kito KeePassXC programos egzemplioriaus.
-Ar vis tiek norite ją atverti?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Atverti tik skaitymui</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Failas atvertas tik skaitymo veiksenoje.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Atverti CSV failą</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Ieškoma...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Pakeisti pagrindinį raktą</translation>
     </message>
@@ -659,36 +1043,44 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Ar tikrai norite ištrinti %1 įrašų?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Perkelti įrašą į šiukšlinę?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Ar tikrai norite perkelti įrašą &quot;%1&quot; į šiukšlinę?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Perkelti įrašus į šiukšlinę?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Ar tikrai norite perkelti %n įrašą į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašus į šiukšlinę?</numerusform><numerusform>Ar tikrai norite perkelti %n įrašų į šiukšlinę?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Ištrinti grupę?</translation>
+        <source>Execute command?</source>
+        <translation>Vykdyti komandą?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Ar tikrai norite ištrinti grupę &quot;%1&quot;?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Ar tikrai norite vykdyti šią komandą?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+        <source>Remember my choice</source>
+        <translation>Prisiminti mano pasirinkimą</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Perkelti įrašą į šiukšlinę?</translation>
+        <source>Delete group?</source>
+        <translation>Ištrinti grupę?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Ar tikrai norite perkelti įrašą &quot;%1&quot; į šiukšlinę?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Ar tikrai norite ištrinti grupę &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Ieškoma...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1099,8 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Nėra rezultatų</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Vykdyti komandą?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Ar tikrai norite vykdyti šią komandą?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Prisiminti mano pasirinkimą</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Automatinio įkėlimo iš naujo užklausa</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1111,9 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Suliejimo užklausa</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Duomenų bazės failas pasikeitė ir jūs turite neįrašytų pakeitimų. Ar norite sulieti savo pakeitimus?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1129,89 @@ Ar vis tiek norite ją atverti?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Užverti</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Bendra</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Naudotojo vardas</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Priedai</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Pastabos</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Langas</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Seka</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Paieška</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Išvalyti</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Niekada</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Išjungta</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Įjungta</translation>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1238,30 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Istorija</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH agentas</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Įrašo istorija</translation>
     </message>
@@ -794,22 +1282,20 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Naujas požymis</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Pasirinkite failą</translation>
+        <source>Confirm Remove</source>
+        <translation>Patvirtinti šalinimą</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Nepavyko atverti failo</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Ar tikrai norite pašalinti šį požymi?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Įrašyti priedą</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Nepavyko įrašyti priedo:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1303,16 @@ Ar vis tiek norite ją atverti?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n savaitė</numerusform><numerusform>%n savaitės</numerusform><numerusform>%n savaičių</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mėnesis</numerusform><numerusform>%n mėnesiai</numerusform><numerusform>%n mėnesių</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 metai</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Patvirtinti šalinimą</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Ar tikrai norite pašalinti šį požymi?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[APSAUGOTA] Norėdami rodyti ar redaguoti, paspauskite atskleisti</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Ar tikrai norite pašalinti šį priedą?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1329,6 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Šalinti</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Priedai</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Įrašyti</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Atverti</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Taisyti pavadinimą</translation>
     </message>
@@ -882,6 +1340,10 @@ Ar vis tiek norite ją atverti?</translation>
         <source>Reveal</source>
         <translation>Atskleisti</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Priedai</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1352,18 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Įjungti šiam įrašui automatinį rinkimą</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Paveldėti numatytąją automatinio rinkimo seką iš &amp;grupės</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Na&amp;udoti tinkintą automatinio rinkimo seka:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Lango asociacijos</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1376,6 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Lango antraštė:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Paveldėti numatytąją automatinio rinkimo seką iš &amp;grupės</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Na&amp;udoti tinkintą automatinio rinkimo seka:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Naudoti numatytąją se&amp;ką</translation>
     </message>
@@ -917,10 +1383,6 @@ Ar vis tiek norite ją atverti?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Nustatyti tinkintą s&amp;eką:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Lango asociacijos</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1406,8 @@ Ar vis tiek norite ją atverti?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Antraštė:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Naudotojo vardas:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1418,104 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Pakartokite:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Antraštė:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Baigia galioti</translation>
+        <source>Notes</source>
+        <translation>Pastabos</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Parinktys</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Pastabos:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Naudotojo vardas:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Baigia galioti</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Kontrolinis kodas</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Viešasis raktas</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Komentaras</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Iššifruoti</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Kopijuoti į iškarpinę</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Privatusis raktas</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Išorinis failas</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Naršyti...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Priedas</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Pridėti į agentą</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Šalinti iš agento</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1045,6 +1587,14 @@ Ar vis tiek norite ją atverti?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>Na&amp;udoti numatytąją piktogramą</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Naudoti tinkintą piktogra&amp;mą</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Pridėti tinkintą piktogramą</translation>
     </message>
@@ -1053,6 +1603,18 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Ištrinti tinkintą piktogramą</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Atsisiųsti svetainės piktogramą</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Nepavyko gauti svetainės piktogramos.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Patarimas: Jūs galite įjungti Google kaip surogatą, perėję į Įrankiai&gt;Nustatymai&gt;Saugumas</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Paveikslai</translation>
     </message>
@@ -1065,24 +1627,12 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Pasirinkite paveikslą</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Atsisiųsti svetainės piktogramą</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Nepavyko gauti svetainės piktogramos.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Nepavyksta perskaityti piktogramos</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>Na&amp;udoti numatytąją piktogramą</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Naudoti tinkintą piktogra&amp;mą</translation>
+        <source>Custom icon already exists</source>
+        <translation>Tinkinta piktograma jau yra</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1642,6 @@ Ar vis tiek norite ją atverti?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Šią piktogramą naudoja %1 įrašai ir ji bus pakeista numatytąja piktograma. Ar tikrai norite ją ištrinti?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Patarimas: Jūs galite įjungti Google kaip surogatą, perėję į Įrankiai&gt;Nustatymai&gt;Saugumas</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Tinkinta piktograma jau yra</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1666,94 @@ Ar vis tiek norite ją atverti?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - Dublikatas</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Pavadinimas</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Dydis</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Pridėti</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Šalinti</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Atverti</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Įrašyti</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Patvirtinti šalinimą</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Įrašyti priedus</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1782,11 @@ Ar vis tiek norite ją atverti?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Nuoroda: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grupė</translation>
     </message>
@@ -1171,11 +1802,6 @@ Ar vis tiek norite ją atverti?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Nuoroda: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1811,17 @@ Ar vis tiek norite ją atverti?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Nepavyksta įrašyti failo!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1884,361 @@ Ar vis tiek norite ją atverti?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nepavyko išduoti iššūkio atsakymo.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Neteisingas raktas arba duomenų bazės failas yra pažeistas.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nepavyko išduoti iššūkio atsakymo.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>trūksta duomenų bazės antraščių</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Neteisingas antraštės kontrolinės sumos dydis</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Antraštės SHA256 neatitikimas</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Nežinomas šifras</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Ne KeePass duomenų bazė.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Pasirinktas failas yra sena KeePass 1 duomenų bazė (.kdb).
+
+Jūs galite ją importuoti, nuspausdami Duomenų bazė &gt; &quot;Importuoti KeePass 1 duomenų bazę...&quot;.
+Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų bazės, naudodami senąją KeePassX 0.4 versija.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1276,6 +2268,35 @@ Ar vis tiek norite ją atverti?</translation>
         <translation>Nepalaikoma KeePass duomenų bazės versija.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Šaknis</translation>
     </message>
@@ -1287,129 +2308,141 @@ Ar vis tiek norite ją atverti?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Neteisingas raktas arba duomenų bazės failas yra pažeistas.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Ne KeePass duomenų bazė.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Nepalaikoma KeePass duomenų bazės versija.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Neteisingas raktas arba duomenų bazės failas yra pažeistas.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nepavyko išduoti iššūkio atsakymo.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Pasirinktas failas yra sena KeePass 1 duomenų bazė (.kdb).
-
-Jūs galite ją importuoti, nuspausdami Duomenų bazė &gt; &quot;Importuoti KeePass 1 duomenų bazę...&quot;.
-Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų bazės, naudodami senąją KeePassX 0.4 versija.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nepavyko išduoti iššūkio atsakymo.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nepavyko apskaičiuoti pagrindinio rakto</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Lemtingoji klaida, testuojant šifravimo funkcijas.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Klaida</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Nepavyko sukurti užrakto. Vieno egzemplioriaus veiksena išjungta.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Jau yra paleistas kitas KeePassXC egzempliorius.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Esamas vieno egzemplioriaus užrakto failas yra neteisingas. Paleidžiamas naujas egzempliorius.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Atverti duomenų bazę</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Duomenų bazės nustatymai</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Kopijuoti naudotojo vardą į iškarpinę</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Kopijuoti slaptažodį į iškarpinę</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Nustatymai</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Rodyti įrankių juostą</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>tik skaitymui</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Perjungti langą</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 duomenų bazė</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Visi failai</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Įrašyti pataisytą duomenų bazę</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Esamas vieno egzemplioriaus užrakto failas yra neteisingas. Paleidžiamas naujas egzempliorius.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Duomenų bazės rašymas nepavyko.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Nepavyko sukurti užrakto. Vieno egzemplioriaus veiksena išjungta.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Jau yra paleistas kitas KeePassXC egzempliorius.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Lemtingoji klaida, testuojant šifravimo funkcijas.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Klaida</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Duomenų bazė</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Paskiausiai naudotos duomenų bazės</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importuoti</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Ž&amp;inynas</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Į&amp;rašai</translation>
     </message>
@@ -1418,12 +2451,16 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Kopijuoti &amp;požymį į iškarpinę</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupės</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>R&amp;odinys</translation>
+        <source>&amp;Tools</source>
+        <translation>Į&amp;rankiai</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2471,10 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Apie</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Atverti duomenų bazę...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Į&amp;rašyti duomenų bazę</translation>
     </message>
@@ -1474,24 +2515,24 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Ištrinti grupę</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Duomenų bazės nustatymai</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Įraš&amp;yti duomenų bazę kaip...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Dubliuoti įrašą</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Pakeisti &amp;pagrindinį raktą...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Numatytosios trukmės vienkartinis slaptažodis</translation>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Duomenų bazės nustatymai</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Kopijuoti &amp;NTVS</translation>
+        <source>Database settings</source>
+        <translation>Duomenų bazės nustatymai</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Rodyti NTVS</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Dubliuoti įrašą</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2543,26 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>Kopijuoti &amp;naudotojo vardą</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Kopijuoti naudotojo vardą į iškarpinę</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Kopijuoti &amp;slaptažodį</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Kopijuoti slaptažodį į iškarpinę</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Nustatymai</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Slaptažodžių generatorius</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Atlikti automatinį rinkimą</translation>
     </message>
@@ -1526,165 +2579,210 @@ Tai yra vienakryptis perkėlimas. Jūs negalėsite atverti importuotos duomenų
         <translation>&amp;Antraštė</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Pastabos</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Slaptažodžių generatorius</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Išvalyti istoriją</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Eksportuoti į CSV failą...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Duomenų bazė</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importuoti KeePass 1 duomenų bazę...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importuoti</translation>
+        <source>Import CSV file...</source>
+        <translation>Importuoti CSV failą...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>Į&amp;rankiai</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Pa&amp;taisyti duomenų bazę...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Rodyti NTVS</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Išvalyti šiukšlinę</translation>
+        <source>Set up TOTP...</source>
+        <translation>Nustatyti NTVS...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Kopijuoti &amp;NTVS</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Išvalyti istoriją</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Konfigūracijos failo %1 prieigos klaida</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Išeiti iš KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Prašome priliesti mygtuką ant savo YubiKey!</translation>
+        <source>read-only</source>
+        <translation>tik skaitymui</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Ž&amp;inynas</translation>
+        <source>Settings</source>
+        <translation>Nustatymai</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Atverti duomenų bazę...</translation>
+        <source>Toggle window</source>
+        <translation>Perjungti langą</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Įraš&amp;yti duomenų bazę kaip...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Išeiti iš KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Pakeisti &amp;pagrindinį raktą...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 duomenų bazė</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Eksportuoti į CSV failą...</translation>
+        <source>All files</source>
+        <translation>Visi failai</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importuoti KeePass 1 duomenų bazę...</translation>
+        <source>Open database</source>
+        <translation>Atverti duomenų bazę</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importuoti CSV failą...</translation>
+        <source>Save repaired database</source>
+        <translation>Įrašyti pataisytą duomenų bazę</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Pa&amp;taisyti duomenų bazę...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Duomenų bazės rašymas nepavyko.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Nustatyti NTVS...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Prašome priliesti mygtuką ant savo YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialogas</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Bendra</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>R&amp;odyti pranešimą, kai reikalaujama prisijungimo duomenų</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Rikiuoti atitinkančius įrašus pagal na&amp;udotojo vardą</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Šal&amp;inti iš įrašų aktyvioje duomenų bazėje visus saugomus leidimus</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Išplėstiniai</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Visada leisti &amp;prieigą prie įrašų</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Visada leisti įrašų at&amp;naujinimą</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Ieš&amp;koti atitinkančių įrašų visose atvertose duomenų bazėse</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP prievadas:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Numatytasis prievadas: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Už&amp;klausti atrakinti duomenų bazę, jeigu ji yra užrakinta</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Rikiuoti atitinkančius įrašus pagal &amp;antraštę</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC klausysis šio prievado ties 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nepavyksta susieti su privilegijuotais prievadais</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nepavyksta susieti su privilegijuotais prievadais žemiau 1024!
-Naudojamas numatytasis prievadas 19455.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Ša&amp;linti iš aktyvios duomenų bazės visus bendrinamus šifravimo raktus</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Grąžinti išplėstines eilutes, kurios prasideda &quot;KPH: &quot;</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatinis eilutės laukų kūrimas ar atnaujinimas nėra palaikomas.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialogas</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1695,6 +2793,15 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>Įjungti KeePassHTTP serverį</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Bendra</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>R&amp;odyti pranešimą, kai reikalaujama prisijungimo duomenų</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Vietoj visos srities visų įrašų, grąžina tik geriausiai tam tikrą URL atitinkančius įrašus.</translation>
     </message>
@@ -1703,6 +2810,10 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>&amp;Grąžinti tik labiausiai atitinkančius įrašus</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Už&amp;klausti atrakinti duomenų bazę, jeigu ji yra užrakinta</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Bus grąžinami įrašai tik su ta pačia schema (http://, https://, ftp://, ...).</translation>
     </message>
@@ -1711,27 +2822,108 @@ Naudojamas numatytasis prievadas 19455.</translation>
         <translation>&amp;Atitikti URL schemas</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Rikiuoti atitinkančius įrašus pagal na&amp;udotojo vardą</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Rikiuoti atitinkančius įrašus pagal &amp;antraštę</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Ša&amp;linti iš aktyvios duomenų bazės visus bendrinamus šifravimo raktus</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Šal&amp;inti iš įrašų aktyvioje duomenų bazėje visus saugomus leidimus</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Slaptažodžių generatorius</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Išplėstiniai</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Visada leisti &amp;prieigą prie įrašų</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Visada leisti įrašų at&amp;naujinimą</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Su klientu turi būti sujungta tik pasirinkta duomenų bazė.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Šie parametrai gali būti pavojingi!
-Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Ieš&amp;koti atitinkančių įrašų visose atvertose duomenų bazėse</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatinis eilutės laukų kūrimas ar atnaujinimas nėra palaikomas.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Grąžinti išplėstines eilutes, kurios prasideda &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP prievadas:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Numatytasis prievadas: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC klausysis šio prievado ties 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Nepavyksta susieti su privilegijuotais prievadais</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Nepavyksta susieti su privilegijuotais prievadais žemiau 1024!
+Naudojamas numatytasis prievadas 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Slaptažodis:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>stiprumas</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropija</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Simbolių tipai</translation>
     </message>
@@ -1752,38 +2944,50 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
         <translation>Specialūs simboliai</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Papildomi ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Pašalinti panašiai atrodančius simbolius</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Priimti</translation>
+        <source>Pick characters from every group</source>
+        <translation>Parinkti simbolius iš kiekvienos grupės</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Ilgis:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>stiprumas</translation>
+        <source>Passphrase</source>
+        <translation>Slaptafrazė</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropija</translation>
+        <source>Wordlist:</source>
+        <translation>Žodžių sąrašas:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Ilgis:</translation>
+        <source>Word Count:</source>
+        <translation>Žodžių skaičius:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Parinkti simbolius iš kiekvienos grupės</translation>
+        <source>Word Separator:</source>
+        <translation>Žodžių skirtukas:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Generuoti</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Kopijuoti</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Priimti</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Užverti</translation>
     </message>
@@ -1801,51 +3005,270 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Blogas</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Silpnas</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Geras</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Puikus</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Slaptažodis</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Papildomi ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Slaptafrazė</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Žodžių sąrašas:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Žodžių skaičius:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Žodžių skirtukas:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopijuoti</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Duomenų bazės kelias.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Išskleisti ir spausdinti duomenų bazės turinį.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Duomenų bazės, kurią išskleisti, kelias.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Komandos, kurią vykdyti, pavadinimas.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Išvardyti duomenų bazės įrašus.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Grupės, kurią išvardyti, kelias. Numatytasis yra /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Sulieti dvi duomenų bazes.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Duomenų bazės, į kurią sulieti, kelias.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Duomenų bazės, iš kurios sulieti, kelias.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Įrašo, kurį rodyti, pavadinimas.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NIEKINIS įrenginys</translation>
@@ -1869,8 +3292,28 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
         <translation>trūksta užveriamosios kabutės</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>VIDINIS - viršyta apatinė negavimo riba</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1889,14 +3332,22 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Pastabos</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Naršyklės integracija</translation>
     </message>
@@ -1912,6 +3363,10 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
         <source>Passive</source>
         <translation>Pasyvus</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH agentas</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1950,8 +3405,8 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Skirti raidžių dydį</translation>
+        <source>Search...</source>
+        <translation>Ieškoti...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1962,8 +3417,8 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
         <translation>Išvalyti</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Ieškoti...</translation>
+        <source>Case Sensitive</source>
+        <translation>Skirti raidžių dydį</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1973,50 +3428,6 @@ Keiskite juos tik tuo atveju, jeigu žinote ką darote.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Bendrinamas šifravimo raktas, pavadinimu &quot;%1&quot; jau yra.
-Ar norite jį perrašyti?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Ar norite atnaujinti informaciją ties %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktyvi duomenų bazė yra užrakinta!
-Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų atrakinta.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Sėkmingai pašalinta %1 šifravimo-%2 iš KeePassX/Http nustatymų.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp nustatymuose nerasta jokių bendrinamų šifravimo raktų.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Aktyvioje duomenų bazėje nėra KeePassHttp nustatymų įrašo.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Šalinami saugomi leidimai...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Nutraukti</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Leidimai sėkmingai pašalinti iš %1 %2.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktyvioje duomenų bazėje nėra įrašo su leidimais.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Naujo rakto susiejimo užklausa</translation>
     </message>
@@ -2034,33 +3445,77 @@ ir priimtumėte jį.</translation>
         <translation>KeePassXC: Perrašyti esamą raktą?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Bendrinamas šifravimo raktas, pavadinimu &quot;%1&quot; jau yra.
+Ar norite jį perrašyti?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Atnaujinti įrašą</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Ar norite atnaujinti informaciją ties %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Duomenų bazė užrakinta!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Aktyvi duomenų bazė yra užrakinta!
+Prašome atrakinti pasirinktą duomenų bazę arba pasirinkti kitą, kuri būtų atrakinta.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Pašalinti raktai iš duomenų bazės</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Raktų nerasta</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>KeePassHttp nustatymuose nerasta jokių bendrinamų šifravimo raktų.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Nustatymai neprieinami!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Aktyvioje duomenų bazėje nėra KeePassHttp nustatymų įrašo.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Šalinami saugomi leidimai...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Nutraukti</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Pašalinti leidimai</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Nerasta jokių įrašų su leidimais!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktyvioje duomenų bazėje nėra įrašo su leidimais.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2084,10 +3539,26 @@ ir priimtumėte jį.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Pagrindiniai nustatymai</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Paleisti tik vieną KeePassXC egzempliorių</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Prisiminti paskutines duomenų bazes</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Prisiminti paskutinius rakto failus ir saugumo saugiklius</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Paleidžiant programą, įkelti ankstesnes duomenų bazes</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Išeinant, automatiškai įrašyti</translation>
     </message>
@@ -2096,20 +3567,28 @@ ir priimtumėte jį.</translation>
         <translation>Automatiškai įrašyti po kiekvieno pakeitimo</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Išoriškai modifikavus duomenų bazę, automatiškai įkelti ją iš naujo</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Kopijuojant į iškarpinę, suskleisti langą</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Paleidus programą, suskleisti langą</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Kuriant įrašus, naudoti grupės piktogramą</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Visuotinis automatinio rinkimo spartusis klavišas</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Nežymėti duomenų bazė kaip pakeistą, jei buvo keičiami ne duomenys, o kita (pvz., išskleidžiamos grupės)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Kalba</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,66 +3599,60 @@ ir priimtumėte jį.</translation>
         <translation>Suskleidus langą, slėpti jį į sistemos dėklą</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Paleidžiant programą, įkelti ankstesnes duomenų bazes</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Išoriškai modifikavus duomenų bazę, automatiškai įkelti ją iš naujo</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Neužverti lango, bet vietoj to, suskleisti jį į sistemos dėklą</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Paleidus programą, suskleisti langą</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Pagrindiniai nustatymai</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Prisiminti paskutinius rakto failus ir saugumo saugiklius</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Nežymėti duomenų bazė kaip pakeistą, jei buvo keičiami ne duomenys, o kita (pvz., išskleidžiamos grupės)</translation>
+        <source>Language</source>
+        <translation>Kalba</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Automatinis rinkimas</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Naudoti įrašo antraštę ir URL, norint sutapatinti langus visuotiniam automatiniam rinkimui</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Visada klausti prieš atliekant automatinį rinkimą</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Visuotinis automatinio rinkimo spartusis klavišas</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Automatinio rinkimo delsa</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Paleisti tik vieną KeePassXC egzempliorių</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Laiko limitai</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Išvalyti iškarpinę po</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>sek.</translation>
     </message>
     <message>
@@ -2187,8 +3660,12 @@ ir priimtumėte jį.</translation>
         <translation>Užrakinti duomenų bazes, kai kompiuteris neaktyvus</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Pagal numatymą, rodyti slaptažodžius atviruoju tekstu</translation>
+        <source>Convenience</source>
+        <translation>Patogumas</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Užrakinti duomenų bazes, kai yra užrakinamas ekranas ar uždaromas nešiojamojo kompiuterio dangtis</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2199,16 +3676,16 @@ ir priimtumėte jį.</translation>
         <translation>Nereikalauti pakartoti slaptažodį, kai šis yra matomas</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Laiko limitai</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Pagal numatymą, rodyti slaptažodžius atviruoju tekstu</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Patogumas</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Užrakinti duomenų bazes, kai yra užrakinamas ekranas ar uždaromas nešiojamojo kompiuterio dangtis</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2230,6 +3707,14 @@ ir priimtumėte jį.</translation>
         <translation>Raktas:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Naudoti tinkintus nustatymus</translation>
     </message>
@@ -2255,6 +3740,7 @@ ir priimtumėte jį.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>sek.</translation>
     </message>
 </context>
@@ -2322,88 +3808,40 @@ ir priimtumėte jį.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>kelias į tinkintą konfigūracijos failą</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>duomenų bazės rakto failas</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - daugiaplatformė slaptažodžių tvarkytuvė</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>nuskaityti duomenų bazės slaptažodį iš stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>norimų atverti slaptažodžių duomenų bazių failų pavadinimai (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Kopijuoti slaptažodį į iškarpinę</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Duomenų bazės kelias.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Naudoti grafinę duomenų bazės atrakinimo užklausą.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Įrašo, kurį apkirpti, pavadinimas.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Išskleisti ir spausdinti duomenų bazės turinį.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Duomenų bazės, kurią išskleisti, kelias.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Komandos, kurią vykdyti, pavadinimas.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Išvardyti duomenų bazės įrašus.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Grupės, kurią išvardyti, kelias. Numatytasis yra /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Spausdinti įrašų ir grupių UUID.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Sulieti dvi duomenų bazes.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - daugiaplatformė slaptažodžių tvarkytuvė</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Duomenų bazės, į kurią sulieti, kelias.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>norimų atverti slaptažodžių duomenų bazių failų pavadinimai (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Duomenų bazės, iš kurios sulieti, kelias.</translation>
+        <source>path to a custom config file</source>
+        <translation>kelias į tinkintą konfigūracijos failą</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Abiems duomenų bazių failams naudoti tą patį slaptažodį.</translation>
+        <source>key file of the database</source>
+        <translation>duomenų bazės rakto failas</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Rodyti slaptažodį.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>nuskaityti duomenų bazės slaptažodį iš stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Įrašo, kurį rodyti, pavadinimas.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_nl_NL.ts b/share/translations/keepassx_nl_NL.ts
index e18f1a908..3191bf949 100644
--- a/share/translations/keepassx_nl_NL.ts
+++ b/share/translations/keepassx_nl_NL.ts
@@ -10,68 +10,72 @@
         <translation>Over</translation>
     </message>
     <message>
-        <source>Contributors</source>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Debug Info</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC wordt verspreid onder de voorwaarden van de GNU General Public License (GPL) versie 2 of (als u wenst) versie 3.</translation>
     </message>
     <message>
-        <source>Copy to clipboard</source>
+        <source>Project Maintainers:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Version %1
-</source>
+        <source>Contributors</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Revision: %1</source>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Libraries:</source>
+        <source>Debug Info</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Operating system: %1
-CPU architecture: %2
-Kernel: %3 %4</source>
+        <source>Include the following information whenever you report a bug:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Enabled extensions:</source>
+        <source>Copy to clipboard</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <source>Version %1
+</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC wordt verspreid onder de voorwaarden van de GNU General Public License (GPL) versie 2 of (als u wenst) versie 3.</translation>
+        <source>Revision: %1</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Project Maintainers:</source>
+        <source>Distribution: %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <source>Libraries:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Include the following information whenever you report a bug:</source>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Distribution: %1</source>
+        <source>Enabled extensions:</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP-toegang bevestigen</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Deze keuze onthouden</translation>
     </message>
@@ -89,9 +93,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 vraagt toegang tot uw wachtwoorden voor het/de volgende item(s).
 Geef aan of u toegang wilt toestaan of niet.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP-toegang bevestigen</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -104,6 +111,26 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Auto-typen - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-typen - KeePassX</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -123,12 +150,289 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-typen - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Kies item om automatisch te typen:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-typen - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Deze keuze onthouden</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Toestaan</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Weigeren</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 vraagt toegang tot uw wachtwoorden voor het/de volgende item(s).
+Geef aan of u toegang wilt toestaan of niet.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialoog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Verzoek om database te ontgrendelen als deze vergrendeld is</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Geavanceerd</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Het automatisch aanmaken of wijzigen van tekenreeks velden wordt niet ondersteund.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Geef geadvanceerde tekenreeks velden terug die met &quot;KH: &quot; beginnen.</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nieuw verzoek voor sleutel associatie</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Huidige sleutel overschrijven?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Item bijwerken</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Wil je de gegevens in %1 - %2 bijwerken?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Database vergrendeld!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>De actieve database is vergrendeld!
+Ontgrendel de geselecteerde database of kies een ontgrendelde database.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Instellingen niet beschikbaar!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Geen sleutels gevonden</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Sleutels uit database verwijderd</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbreken</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissies verwijderd</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Geen item met permissies gevonden!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>De actieve database bevat geen items met permissies.</translation>
     </message>
 </context>
 <context>
@@ -146,6 +450,10 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <translation>Wachtwoord herhalen:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Sleutelbestand</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Bladeren</translation>
     </message>
@@ -154,6 +462,14 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <translation>Creëren</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Sleutelbestanden</translation>
     </message>
@@ -174,6 +490,10 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <translation>Kies een sleutelbestand</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Weet u zeker dat u een leeg veld als wachtwoord wilt gebruiken?</translation>
     </message>
@@ -188,19 +508,14 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Sleutelbestand</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Empty password</source>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -215,15 +530,15 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Replace username and password with references</source>
+        <source>Append &apos; - Clone&apos; to title</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy history</source>
+        <source>Replace username and password with references</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Append &apos; - Clone&apos; to title</source>
+        <source>Copy history</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -322,10 +637,6 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Fout</translation>
     </message>
@@ -336,17 +647,17 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -368,14 +679,37 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <translation>Bladeren</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
-        <translation>Niet mogelijk om de database te openen.</translation>
+        <translation>Het is niet mogelijk om de database te openen.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
         <translation>Niet mogelijk om het sleutelbestand te openen</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Alle bestanden</translation>
     </message>
@@ -387,14 +721,6 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <source>Select key file</source>
         <translation>Kies sleutelbestand</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -411,12 +737,12 @@ Geef aan of u toegang wilt toestaan of niet.</translation>
         <translation>Niet mogelijk om het sleutelbestand te openen</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Database werd zonder problemen geopend. Niets te doen.</translation>
+        <source>Unable to open the database.</source>
+        <translation>Het is niet mogelijk om de database te openen.</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Niet mogelijk om de database te openen.</translation>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Database werd zonder problemen geopend. Niets te doen.</translation>
     </message>
     <message>
         <source>Success</source>
@@ -436,40 +762,57 @@ U kunt deze nu opslaan.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Naam van de database:</translation>
+        <source>General</source>
+        <translation>Algemeen</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Beschrijving van de database:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Transformatierondes:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Standaard gebruikersnaam:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Test</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Max. items in geschiedenis:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Max. geschiedenisgrootte:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Prullenbak gebruiken</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -480,14 +823,78 @@ U kunt deze nu opslaan.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Algorithm:</source>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Transformatierondes:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Naam van de database:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Beschrijving van de database:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Standaard gebruikersnaam:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Max. items in geschiedenis:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Max. geschiedenisgrootte:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Prullenbak gebruiken</translation>
+    </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Alles</translation>
     </message>
     <message>
@@ -507,22 +914,48 @@ U kunt deze nu opslaan.</translation>
         <translation>Bestand niet gevonden!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1-database openen</translation>
+        <source>Unable to open the database.</source>
+        <translation>Het is niet mogelijk om de database te openen.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1-database</translation>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV-bestand</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Alle bestanden (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Database samenvoegen</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1-database openen</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1-database</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Sluiten?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; is gewijzigd.
+Wijzigingen ongedaan maken en doorgaan met sluiten?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Wijzigingen opslaan?</translation>
     </message>
@@ -537,10 +970,22 @@ Opslaan?</translation>
         <translation>Het opslaan van de database is mislukt.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Wachtwoorden</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Database opslaan als</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Database exporteren naar CSV-bestand</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Schrijven van het CSV-bestand mislukt.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nieuwe database</translation>
     </message>
@@ -559,12 +1004,6 @@ Please press cancel to finish your changes or discard them.</source>
 Druk op annuleren om uw wijzigingen aan te passen of gooi de wijzigingen weg.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Deze database is nog niet opgeslagen.
-U kunt de database opslaan of het vergrendelen annuleren.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -572,71 +1011,16 @@ Otherwise your changes are lost.</source>
 Wilt u de database opslaan voordat u deze vergrendelt?
 Zo nee, dan gaan de wijzigingen verloren.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; is gewijzigd.
-Wijzigingen ongedaan maken en doorgaan met sluiten?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Database exporteren naar CSV-bestand</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV-bestand</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Schrijven van het CSV-bestand mislukt.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Het is niet mogelijk om de database te openen.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Database samenvoegen</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>De database die u op probeert te slaan is vergrendeld door een andere instantie van KeePassXC.
-Wilt u toch doorgaan met opslaan?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Wachtwoorden</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Database is al geopend</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>De database die u probeert te openen is vergrendeld door een andere instantie van KeePassXC.
-Wilt u toch doorgaan met openen?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Openen als alleen-lezen</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Bezig met zoeken...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
-        <translation>Wijzig hoofdsleutel</translation>
+        <translation>Hoofdsleutel wijzigen</translation>
     </message>
     <message>
         <source>Delete entry?</source>
@@ -655,36 +1039,44 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Weet u zeker dat u %1 elementen wilt wissen?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Wilt u het item naar de prullenbak verplaatsen?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Weet u zeker dat u item &quot;%1&quot; naar de prullenbak wilt verplaatsen?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Elementen naar de prullenbak verplaatsen?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Weet u zeker dat u %n element naar de prullenbak wilt verplaatsen?</numerusform><numerusform>Weet u zeker dat u %n elementen naar de prullenbak wilt verplaatsen?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Groep verwijderen?</translation>
+        <source>Execute command?</source>
+        <translation>Commando uitvoeren?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Weet u zeker dat u de groep &quot;%1&quot; wilt verwijderen?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Weet u zeker dat u het volgende commando wilt uitvoeren? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+        <source>Remember my choice</source>
+        <translation>Mijn keuze onthouden</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Wilt u het item naar de prullenbak verplaatsen?</translation>
+        <source>Delete group?</source>
+        <translation>Groep verwijderen?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Weet u zeker dat u item &quot;%1&quot; naar de prullenbak wilt verplaatsen?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Weet u zeker dat u de groep &quot;%1&quot; wilt verwijderen?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Bezig met zoeken...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -703,20 +1095,8 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Geen resultaten</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Commando uitvoeren?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Weet u zeker dat u het volgende commando wilt uitvoeren? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Mijn keuze onthouden</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Automatisch herladen-verzoeken</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -727,8 +1107,9 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Samenvoegingsverzoek</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Het database-bestand is gewijzigd en u heeft niet-opgeslagen wijzigingen. Wilt u uw wijzigingen samenvoegen?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -744,6 +1125,89 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Sluiten</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Gebruikersnaam</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Bijlagen</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Opmerkingen</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Venster</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Volgorde</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Zoeken</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Wissen</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -770,6 +1234,30 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Geschiedenis</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Geschiedenis van element</translation>
     </message>
@@ -783,29 +1271,27 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
-        <translation>Verschillende wachtwoorden opgegeven.</translation>
+        <translation>U heeft verschillende wachtwoorden opgegeven.</translation>
     </message>
     <message>
         <source>New attribute</source>
         <translation>Nieuwe eigenschap</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Kies bestand</translation>
+        <source>Confirm Remove</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Niet mogelijk om bestand te openen</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Bijlage opslaan</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Niet mogelijk om de bijlage op te slaan:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -813,32 +1299,16 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n week</numerusform><numerusform>%n weken</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n maand</numerusform><numerusform>%n maanden</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 jaar</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -855,18 +1325,6 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Verwijderen</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Bijlagen</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Opslaan</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Open</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation type="unfinished"/>
     </message>
@@ -878,6 +1336,10 @@ Wilt u toch doorgaan met openen?</translation>
         <source>Reveal</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Bijlagen</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -886,6 +1348,18 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Auto-typen inschakelen voor dit element</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Erf standaard auto-typevolgorde van de &amp;groep</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Gebruik aangepaste auto-typevolgorde:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -898,14 +1372,6 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Venstertitel:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Erf standaard auto-typevolgorde van de &amp;groep</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Gebruik aangepaste auto-typevolgorde:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Gebruik standaardvolgorde</translation>
     </message>
@@ -913,10 +1379,6 @@ Wilt u toch doorgaan met openen?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Stel aangepaste volgorde in:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -940,12 +1402,8 @@ Wilt u toch doorgaan met openen?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Titel:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Gebruikersnaam:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -956,20 +1414,104 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Herhalen:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Titel:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Verloopt</translation>
+        <source>Notes</source>
+        <translation>Opmerkingen</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Ingebouwd</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Opmerkingen:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Gebruikersnaam:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Verloopt</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -992,7 +1534,7 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
     <message>
         <source>Edit group</source>
-        <translation>Groep wijzigen</translation>
+        <translation>Bewerk groep</translation>
     </message>
     <message>
         <source>Enable</source>
@@ -1041,6 +1583,14 @@ Wilt u toch doorgaan met openen?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Gebruik standaardicoon</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Gebruik aangepast icoon</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Voeg icoon toe</translation>
     </message>
@@ -1049,6 +1599,18 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Verwijder icoon</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Favicon downloaden</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Favicon kan niet worden opgehaald.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Afbeeldingen</translation>
     </message>
@@ -1061,24 +1623,12 @@ Wilt u toch doorgaan met openen?</translation>
         <translation>Kies afbeelding</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Favicon downloaden</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Favicon kan niet worden opgehaald.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Kan icoon niet lezen</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Gebruik standaardicoon</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Gebruik aangepast icoon</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1088,14 +1638,6 @@ Wilt u toch doorgaan met openen?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1120,10 +1662,94 @@ Wilt u toch doorgaan met openen?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Kloon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Naam</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Toevoegen</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Verwijderen</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Open</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Opslaan</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1152,6 +1778,11 @@ Wilt u toch doorgaan met openen?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Groep</translation>
     </message>
@@ -1167,11 +1798,6 @@ Wilt u toch doorgaan met openen?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1181,6 +1807,17 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1243,6 +1880,358 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Verkeerde sleutel of corrupte database.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Geen Keepass-database.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1250,7 +2239,7 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
-        <translation>Niet mogelijk om de database te openen.</translation>
+        <translation>Het is niet mogelijk om de database te openen.</translation>
     </message>
 </context>
 <context>
@@ -1261,7 +2250,7 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>Geen Keepass-database</translation>
+        <translation>Geen Keepass-database.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -1269,7 +2258,36 @@ Wilt u toch doorgaan met openen?</translation>
     </message>
     <message>
         <source>Unsupported KeePass database version.</source>
-        <translation>Niet-ondersteunde versie van Keepass-database</translation>
+        <translation>Niet-ondersteunde versie van Keepass-database.</translation>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root</source>
@@ -1283,126 +2301,141 @@ Wilt u toch doorgaan met openen?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Verkeerde sleutel of corrupte database.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Geen Keepass-database.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Niet-ondersteunde versie van Keepass-database.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Verkeerde sleutel of corrupte database.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <source>Incorrect group creation time field size</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Niet mogelijk om hoofdsleutel te berekenen</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Fatale fout bij het testen van de cryptografische functies.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassX - Fout</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Incorrect group level field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Invalid group field type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Open database</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Database-instellingen</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Kopieer gebruikersnaam naar klembord</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Kopieer wachtwoord naar klembord</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Werkbalk weergeven</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>alleen-lezen</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Wissel venster</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Database</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Alle bestanden</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Gerepareerde database opslaan</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Opslaan van de database is mislukt.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Fatale fout bij het testen van de cryptografische functies.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassX - Fout</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Recente databases</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Items</translation>
     </message>
@@ -1411,12 +2444,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopieer eigenschap naar klembord</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Groepen</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Beeld</translation>
+        <source>&amp;Tools</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1427,6 +2464,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Over</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Sla database op</translation>
     </message>
@@ -1467,24 +2508,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Verwijder groep</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Database-instellingen</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Kloon item</translation>
+        <source>Change &amp;master key...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation type="unfinished"/>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Database-instellingen</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation type="unfinished"/>
+        <source>Database settings</source>
+        <translation>Database-instellingen</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation type="unfinished"/>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Kloon item</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1495,14 +2536,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Kopieer &amp;gebruikersnaam</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Kopieer gebruikersnaam naar klembord</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Kopieer wachtwoord</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Kopieer wachtwoord naar klembord</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Instellingen</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Wachtwoord generator</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Voer auto-typen uit</translation>
     </message>
@@ -1519,165 +2572,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Titel</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Opmerkingen</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Wachtwoord generator</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
+        <source>&amp;Export to CSV file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
+        <source>Import KeePass 1 database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import</source>
+        <source>Import CSV file...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
+        <source>Re&amp;pair database...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>Show TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Access error for config file %1</source>
+        <source>Set up TOTP...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
+        <source>Copy &amp;TOTP</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
+        <source>E&amp;mpty recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Help</source>
+        <source>Clear history</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Open database...</source>
+        <source>Access error for config file %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>read-only</source>
+        <translation>alleen-lezen</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Wissel venster</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2-database</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>Alle bestanden</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>Database openen</translation>
+    </message>
+    <message>
+        <source>Save repaired database</source>
+        <translation>Gerepareerde database opslaan</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>Het opslaan van de database is mislukt.</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>OptionDialog</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Toon een notificatie wanneer inloggegevens worden aangevraagd</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sorteer gegeven items op $gebruikersnaam</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Verwijder alle opgeslagen permissies van items uit de actieve database</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Geavanceerd</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Altijd &amp;toegang verlenen tot items</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Altijd &amp;bewerken toestaan op items</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Zoek in alle geopende databases naar overeenkomende items</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP-poort:</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Standaard poort: 19455</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Verzoek om database te ontgrendelen als deze vergrendeld is</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sorteer &amp;overeenkomende items op titel</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC zal op deze poort op 127.0.0.1 luisteren</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Kan niet binden op bevoorrechte poorten</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Kan niet binden naar bevoorrechte poorten onder 1024!
-Standaardpoort 19455 wordt gebruikt.</translation>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Verwijder alle gedeelde encryptiesleutels uit de actieve database</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Geef geadvanceerde tekenreeks velden terug die met &quot;KH: &quot; beginnen.</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Het automatisch aanmaken of wijzigen van tekenreeks velden wordt niet ondersteund.</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialoog</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1688,6 +2786,15 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>General</source>
+        <translation>Algemeen</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Toon een notificatie wanneer inloggegevens worden aangevraagd</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"/>
     </message>
@@ -1696,6 +2803,10 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Verzoek om database te ontgrendelen als deze vergrendeld is</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation type="unfinished"/>
     </message>
@@ -1704,26 +2815,108 @@ Standaardpoort 19455 wordt gebruikt.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Sorteer gegeven items op $gebruikersnaam</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Sorteer &amp;overeenkomende items op titel</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Verwijder alle gedeelde encryptiesleutels uit de actieve database</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Verwijder alle opgeslagen permissies van items uit de actieve database</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Wachtwoord generator</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Geavanceerd</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Altijd &amp;toegang verlenen tot items</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Altijd &amp;bewerken toestaan op items</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Zoek in alle geopende databases naar overeenkomende items</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Het automatisch aanmaken of wijzigen van tekenreeks velden wordt niet ondersteund.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Geef geadvanceerde tekenreeks velden terug die met &quot;KH: &quot; beginnen.</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP-poort:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Standaard poort: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC zal op deze poort op 127.0.0.1 luisteren</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Kan niet binden op bevoorrechte poorten</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Kan niet binden naar bevoorrechte poorten onder 1024!
+Standaardpoort 19455 wordt gebruikt.</translation>
+    </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Wachtwoord:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>sterkte</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropie</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Tekens</translation>
     </message>
@@ -1744,38 +2937,50 @@ Change them only if you know what you are doing.</source>
         <translation>Speciale tekens</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
-        <translation>Geen op elkaar lijkende tekens</translation>
+        <translation>Sluit op elkaar lijkende tekens uit</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Accepteren</translation>
+        <source>Pick characters from every group</source>
+        <translation>Zorg dat het wachtwoord tekens uit iedere groep bevat</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Lengte:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>sterkte</translation>
+        <source>Passphrase</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropie</translation>
+        <source>Wordlist:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Lengte:</translation>
+        <source>Word Count:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Zorg dat het wachtwoord tekens uit iedere groep bevat</translation>
+        <source>Word Separator:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Generate</source>
         <translation>Genereren</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Accepteren</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Sluiten</translation>
     </message>
@@ -1793,51 +2998,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Slecht</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Zwak</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Goed</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Uitstekend</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Wachtwoord</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Client public key not received</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
+        <source>Timeout or cannot connect to KeePassXC</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
+        <source>Action cancelled or denied</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation type="unfinished"/>
@@ -1860,7 +3284,27 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1880,14 +3324,22 @@ Change them only if you know what you are doing.</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Opmerkingen</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation type="unfinished"/>
     </message>
@@ -1903,6 +3355,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1941,8 +3397,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Hoofdlettergevoelig</translation>
+        <source>Search...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Search</source>
@@ -1953,8 +3409,8 @@ Change them only if you know what you are doing.</source>
         <translation>Wissen</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation type="unfinished"/>
+        <source>Case Sensitive</source>
+        <translation>Hoofdlettergevoelig</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1964,50 +3420,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Een gedeelde encryptiesleutel met de naam &quot;%1&quot; bestaat al.
-Wil je deze overschrjiven?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Wil je de gegevens in %1 - %2 bijwerken?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>De actieve database is vergrendeld!
-Ontgrendel de geselecteerde database of kies een ontgrendelde database.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>%1 encryptie%2 succesvol verwijderd uit de KeePassX/Http instellingen.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Geen gedeelde encryptiesleutels gevonen in de KeePassHttp instellingen.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>De actieve database bevat geen KeePassHttp instellingen.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Opgeslagen permissies verwijderen...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Afbreken</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>De permissies zijn met succes verwijderd uit %1 %2.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>De actieve database bevat geen items met permissies.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Nieuw verzoek voor sleutel associatie</translation>
     </message>
@@ -2023,33 +3435,77 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation>KeePassXC: Huidige sleutel overschrijven?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Een gedeelde encryptiesleutel met de naam &quot;%1&quot; bestaat al.
+Wil je deze overschrjiven?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Item bijwerken</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Wil je de gegevens in %1 - %2 bijwerken?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Database vergrendeld!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>De actieve database is vergrendeld!
+Ontgrendel de geselecteerde database of kies een ontgrendelde database.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Sleutels uit database verwijderd</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Geen sleutels gevonden</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Geen gedeelde encryptiesleutels gevonen in de KeePassHttp instellingen.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Instellingen niet beschikbaar!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>De actieve database bevat geen KeePassHttp instellingen.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Opgeslagen permissies verwijderen...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Afbreken</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Permissies verwijderd</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Geen item met permissies gevonden!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>De actieve database bevat geen items met permissies.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2073,10 +3529,26 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Onthoud laatste databases</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Open vorige databases bij starten</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Automatisch opslaan bij afsluiten</translation>
     </message>
@@ -2085,20 +3557,28 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation>Automatisch opslaan na iedere wijziging</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Herlaad database automatisch als deze van buitenaf is gewijzigd</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimaliseer bij kopiëren naar klembord</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Scherm minimaliseren bij het opstarten</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Gebruik icoon van de groep voor nieuwe elementen</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globale sneltoets voor auto-typen</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Taal</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2109,66 +3589,60 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation>Bij minimaliseren enkel icoon in systray tonen</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Open vorige databases bij starten</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Herlaad database automatisch als deze van buitenaf is gewijzigd</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Bij sluiten icoon in systray tonen in plaats van volledig afsluiten</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Scherm minimaliseren bij het opstarten</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Dark system tray icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation type="unfinished"/>
+        <source>Language</source>
+        <translation>Taal</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Auto-typen - KeePassX</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always ask before performing Auto-Type</source>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type delay</source>
+        <source>Always ask before performing Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source> ms</source>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globale sneltoets voor auto-typen</translation>
+    </message>
+    <message>
+        <source>Auto-Type delay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Leeg klembord na</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>sec</translation>
     </message>
     <message>
@@ -2176,8 +3650,12 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation>Vergrendel databases na inactiviteit van</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Laat wachtwoorden standaard zien</translation>
+        <source>Convenience</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2188,15 +3666,15 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation>Herhalen van wachtwoord niet vereisen als deze zichtbaar is</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Laat wachtwoorden standaard zien</translation>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Hide passwords in the preview panel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Hide entry notes by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2219,6 +3697,14 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation type="unfinished"/>
     </message>
@@ -2244,6 +3730,7 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>sec</translation>
     </message>
 </context>
@@ -2311,27 +3798,7 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>pad naar een configuratiebestand</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>sleutelbestand van de database</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeepassX - multi-platform wachtwoordbeheerder</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>lees wachtwoord van de database uit stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>bestandsnamen van de te openen wachtwoorddatabases (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2339,59 +3806,31 @@ Geef het een unieke identificerende naam en accepteer de associate wanneer je de
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>List database entries.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeepassX - multi-platform wachtwoordbeheerder</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation type="unfinished"/>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>bestandsnamen van de te openen wachtwoorddatabases (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation type="unfinished"/>
+        <source>path to a custom config file</source>
+        <translation>pad naar een configuratiebestand</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation type="unfinished"/>
+        <source>key file of the database</source>
+        <translation>sleutelbestand van de database</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation type="unfinished"/>
+        <source>read password of the database from stdin</source>
+        <translation>lees wachtwoord van de database uit stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
 </context>
diff --git a/share/translations/keepassx_pl.ts b/share/translations/keepassx_pl.ts
index 66574202f..9abb6eb88 100644
--- a/share/translations/keepassx_pl.ts
+++ b/share/translations/keepassx_pl.ts
@@ -10,14 +10,34 @@
         <translation>O programie</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Zgłoś błędy na: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC jest dystrybuowany zgodnie z warunkami licencji GNU General Public License (GPL) w wersji 2 lub (opcjonalnie) w wersji 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Opiekunowie projektu:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Współtwórcy</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Zobacz wkłady na GitHubie&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Informacje debugowania</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Uwzględnij następujące informacje, gdy zgłaszasz błąd:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Skopiuj do schowka</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Rewizja: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Dystrybucja: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Biblioteki:</translation>
     </message>
@@ -47,34 +71,14 @@ Jądro: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Włączone rozszerzenia:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Zgłoś błędy na: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC jest dystrybuowany zgodnie z warunkami licencji GNU General Public License (GPL) w wersji 2 lub (opcjonalnie) w wersji 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Opiekunowie projektu:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Zobacz wkłady na GitHubie&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Uwzględnij następujące informacje, gdy zgłaszasz błąd:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Dystrybucja: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Potwierdź dostęp KeePassXC HTTP</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Zapamiętaj tę decyzję</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 zażądał dostępu do haseł dla następujących element(ów).
 Wybierz, czy chcesz zezwolić na dostęp.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Potwierdź dostęp KeePassXC HTTP</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Włącz agenta SSH (wymaga ponownego uruchomienia)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Auto-uzupełnianie - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-uzupełnianie</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-uzupełnianie - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Wybierz wpis do auto-uzupełniania:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-uzupełnianie - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Zapamiętaj tę decyzję</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Zezwól</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Odmów</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 zażądał dostępu do haseł dla następujących element(ów).
+Wybierz, czy chcesz zezwolić na dostęp.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Żąda&amp;j odblokowania bazy danych, jeżeli jest zablokowana</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Zwracaj tylko najlepsze dopasowania wpisów dla URL zamiast wszystkich wpisów całej domeny.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Zaawansowane</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Tylko wybrana baza danych musi być podłączona do klienta.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatyczne tworzenie albo aktualizowanie pól ciągów znaków nie jest obsługiwane.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Zwracaj zaawansowane pola ciągów znaków, które zaczynają się od &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Przeglądaj...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nowe żądanie skojarzenia klucza</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Nadpisać istniejący klucz?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Aktualizacja wpisu</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Czy chcesz uaktualnić informację w %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Baza danych zablokowana!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Aktywna baza danych jest zablokowana!
+Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Ustawienia niedostępne!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nie znaleziono kluczy</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Usunięto klucze z bazy danych</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Zaniechaj</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Usunięto uprawnienia</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nie znaleziono wpisu z uprawnieniami!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktywna baza danych nie zawiera wpisu z uprawnieniami.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Wprowadź ponownie hasło:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Plik klucza</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Przeglądaj</translation>
     </message>
@@ -157,6 +465,14 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Stwórz</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>&amp;Wyzwanie-odpowiedź</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Odśwież</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Pliki kluczy</translation>
     </message>
@@ -177,6 +493,10 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Wybierz plik z kluczem</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Puste hasło</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Czy na pewno chcesz używać pustego ciągu jako hasła?</translation>
     </message>
@@ -191,20 +511,15 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Plik klucza</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>&amp;Wyzwanie-odpowiedź</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Odśwież</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Puste hasło</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Opcje klonowania</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Dodaj &apos; - Klon&apos; do nazwy</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Wymień nazwę użytkownika i hasło z odniesieniami</translation>
     </message>
@@ -225,10 +544,6 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <source>Copy history</source>
         <translation>Skopiuj historię</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Dodaj &apos; - Klon&apos; do nazwy</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importuj plik CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Błąd</translation>
     </message>
@@ -340,17 +651,17 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> bajt, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> rzędy, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> kolumny</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Przeglądaj</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Odśwież</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Wyzwanie-odpowiedź:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Nie można otworzyć bazy danych.</translation>
     </message>
@@ -380,6 +699,21 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Nie mogę otworzyć pliku z kluczem</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Wszystkie pliki</translation>
     </message>
@@ -391,14 +725,6 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <source>Select key file</source>
         <translation>Wybierz plik z kluczem</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Odśwież</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Wyzwanie-odpowiedź:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Wybierz, czy chcesz zezwolić na dostęp.</translation>
         <translation>Nie mogę otworzyć pliku z kluczem</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Pomyślnie otworzono bazę danych. Nic do zrobienia.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Nie można otworzyć bazy danych.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Pomyślnie otworzono bazę danych. Nic do zrobienia.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Sukces</translation>
     </message>
@@ -440,40 +766,57 @@ Możesz teraz ją już zapisać.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nazwa bazy danych:</translation>
+        <source>General</source>
+        <translation>Ogólne</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Opis bazy danych:</translation>
+        <source>Encryption</source>
+        <translation>Szyfrowanie</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Liczba rund szyfrowania:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Domyślny użytkownik:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Test sprawności</translation>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Maks. liczba wpisów w historii:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Maks. rozmiar historii:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Użyj kosza</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ Możesz teraz ją już zapisać.</translation>
         <translation>Twofish:  256-bitowy</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algorytm:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Liczba rund szyfrowania:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nazwa bazy danych:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Opis bazy danych:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Domyślny użytkownik:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Maks. liczba wpisów w historii:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Maks. rozmiar historii:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Użyj kosza</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Główna</translation>
     </message>
     <message>
@@ -511,22 +918,48 @@ Możesz teraz ją już zapisać.</translation>
         <translation>Nie znaleziono pliku!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Otwieranie bazy danych KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Nie można otworzyć bazy danych.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Baza danych KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Plik otwarty w trybie tylko do odczytu.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Otwieranie pliku CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>plik CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Wszystkie pliki (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Połączenie baz danych</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Otwieranie bazy danych KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Baza danych KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Zamknąć?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; jest w trybie edytowania.
+Odrzucić zmiany i zamknąć?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Zapisać zmiany?</translation>
     </message>
@@ -538,13 +971,25 @@ Zapisać zmiany?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>Błąd w zapisywaniu bazy danych.</translation>
+        <translation>Błąd przy zapisie bazy danych.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Hasła</translation>
     </message>
     <message>
         <source>Save database as</source>
         <translation>Zapisz bazę danych jako</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Eksportowanie bazy danych do pliku CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Błąd przy zapisywaniu pliku CSV.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nowa baza danych</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Naciśnij anuluj, aby zakończyć zmiany albo porzucić je.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Baza danych nie została nigdy zapisana.
-Możesz ją zapisać albo przestać blokować.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,70 +1015,14 @@ Otherwise your changes are lost.</source>
 Czy chcesz zapisać przed zablokowaniem jej?
 W przeciwnym wypadku zmiany zostaną porzucone.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; jest w trybie edytowania.
-Odrzucić zmiany i zamknąć?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Eksportowanie bazy danych do pliku CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>plik CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Błąd przy zapisywaniu pliku CSV.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Nie można otworzyć bazy danych.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Połączenie baz danych</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Baza danyh, którą próbujesz zapisać, jest zablokowana przez inną instancję KeePassXC.
-Czy chcesz zapisać mimo to?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Hasła</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Baza danych jest już otwarta</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Baza danych, którą próbujesz otworzyć, jest zablokowana przez inną instancję KeePassXC.
-
-Czy chcesz ją otworzyć mimo to?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Otwórz tylko do odczytu</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Plik otwarty w trybie tylko do odczytu.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Otwieranie pliku CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Wyszukiwanie...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Zmień główne hasło</translation>
     </message>
@@ -660,36 +1043,44 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Czy na prawdę chcesz usunąć %1 wpisów na dobre?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Przenieść wpis do kosza?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Czy na pewno chcesz przenieść wpis&quot; %1&quot; do kosza?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Przenieść wpisy do kosza?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Czy na pewno chcesz przenieść %n wpis do kosza?</numerusform><numerusform>Czy na pewno chcesz przenieść %n wpisów do kosza?</numerusform><numerusform>Czy na pewno chcesz przenieść %n wpisów do kosza?</numerusform><numerusform>Czy na pewno chcesz przenieść %n wpisów do kosza?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Usunąć grupę?</translation>
+        <source>Execute command?</source>
+        <translation>Wykonać polecenie?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Czy na pewno całkowicie usunąć grupę &quot;%1&quot;?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Czy na pewno chcesz wykonać następujące polecenie?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nie mogę wyliczyć głównego klucza</translation>
+        <source>Remember my choice</source>
+        <translation>Zapamiętaj mój wybór</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Przenieść wpis do kosza?</translation>
+        <source>Delete group?</source>
+        <translation>Usunąć grupę?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Czy na pewno chcesz przenieść wpis&quot; %1&quot; do kosza?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Czy na pewno całkowicie usunąć grupę &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Wyszukiwanie...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Nie mogę wyliczyć głównego klucza</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -708,20 +1099,8 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Brak wyników</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Wykonać polecenie?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Czy na pewno chcesz wykonać następujące polecenie?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Zapamiętaj mój wybór</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Żądanie automatycznego przeładowania</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -732,8 +1111,9 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Połącz żądanie</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Plik bazy danych został zmieniony, a masz niezapisane zmiany. Czy chcesz połączyć twoje zmiany?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -749,6 +1129,89 @@ Czy chcesz ją otworzyć mimo to?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Użytkownik</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Załączniki</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notatki</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Okno</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sekwencja</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Szukaj</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Wyczyść</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -775,6 +1238,30 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Historia</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Historia wpisu</translation>
     </message>
@@ -795,22 +1282,20 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Nowy atrybut</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Wybierz plik</translation>
+        <source>Confirm Remove</source>
+        <translation>Potwierdź usunięcie</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Nie można otworzyć pliku</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Czy na pewno chcesz usunąć ten atrybut?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Zapisz załącznik</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Nie można zapisać załącznika:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -818,32 +1303,16 @@ Czy chcesz ją otworzyć mimo to?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n tydzień</numerusform><numerusform>%n tygodni(e)</numerusform><numerusform>%n tygodni(e)</numerusform><numerusform>%n tygodni(e)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiąc(e)</numerusform><numerusform>%n miesiąc(e)</numerusform><numerusform>%n miesiąc(e)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 rok</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Potwierdź usunięcie</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Czy na pewno chcesz usunąć ten atrybut?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[CHRONIONE] Wciśnij Odsłoń, aby zobaczyć albo edytować</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Czy na pewno chcesz usunąć ten załącznik?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -860,18 +1329,6 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Usuń</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Załączniki</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Zapisz</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Otwórz</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Edytuj nazwę</translation>
     </message>
@@ -883,6 +1340,10 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <source>Reveal</source>
         <translation>Odsłoń</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Załączniki</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -891,6 +1352,18 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Włącz auto-uzupełnianie dla tego wpisu</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Dziedzicz domyślną sekwencję auto-uzupełniania z &amp;grupy</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Używaj niestandardowej sekwencji auto-uzupełniania:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Skojarzone okna</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -903,14 +1376,6 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Tytuł okna:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Dziedzicz domyślną sekwencję auto-uzupełniania z &amp;grupy</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Używaj niestandardowej sekwencji auto-uzupełniania:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Korzystaj z dom&amp;yślnej sekwencji</translation>
     </message>
@@ -918,10 +1383,6 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Ustaw niest&amp;andardową sekwencję:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Skojarzone okna</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -945,12 +1406,8 @@ Czy chcesz ją otworzyć mimo to?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Tytuł:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Użytkownik:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -961,20 +1418,104 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Powtórz:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Tytuł:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Wygasa</translation>
+        <source>Notes</source>
+        <translation>Notatki</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notatki:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Użytkownik:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Wygasa</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Skopiuj do schowka</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Przeglądaj...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1046,6 +1587,14 @@ Czy chcesz ją otworzyć mimo to?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Użyj ikony domyślnej</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Użyj niesta&amp;ndardowej ikony</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Dodaj niestandardową ikonę</translation>
     </message>
@@ -1054,6 +1603,18 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Usuń niestandardową ikonę</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Pobierz ikonę ulubionych</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Nie można pobrać ikony ulubionych.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Wskazówka: możesz włączyć Google jako zastępstwo w menu Narzędzia&gt;Ustawienia&gt;Bezpieczeństwo</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Obrazy</translation>
     </message>
@@ -1066,24 +1627,12 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Wybierz obraz</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Pobierz ikonę ulubionych</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Nie można pobrać ikony ulubionych.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Nie można odczytać ikony</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Użyj ikony domyślnej</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Użyj niesta&amp;ndardowej ikony</translation>
+        <source>Custom icon already exists</source>
+        <translation>Ikona niestandardowa już istnieje</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1093,14 +1642,6 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Ta ikona używana jest przez %1 wpisów i zostanie zamieniona na ikonę domyślną. Czy na pewno chcesz ją usunąć?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Wskazówka: możesz włączyć Google jako zastępstwo w menu Narzędzia&gt;Ustawienia&gt;Bezpieczeństwo</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Ikona niestandardowa już istnieje</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1125,10 +1666,94 @@ Czy chcesz ją otworzyć mimo to?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Klon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nazwa</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Dodaj</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Otwórz</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Zapisz</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Potwierdź usunięcie</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1157,6 +1782,11 @@ Czy chcesz ją otworzyć mimo to?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Odniesienie:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grupa</translation>
     </message>
@@ -1172,11 +1802,6 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Odniesienie:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1186,6 +1811,17 @@ Czy chcesz ją otworzyć mimo to?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1248,6 +1884,361 @@ Czy chcesz ją otworzyć mimo to?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nie mogę wyliczyć głównego klucza</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nie można wywołać wyzwania-odpowiedzi.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Błędny klucz lub baza danych jest uszkodzona.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Nie można wywołać wyzwania-odpowiedzi.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nie mogę wyliczyć głównego klucza</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nie mogę wyliczyć głównego klucza</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Nie mogę wyliczyć głównego klucza</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>To nie baza danych KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Wybrany plik jest starą bazą danych KeePassX 1 (.kdb).
+
+Możesz zaimportować ją przez wybranie Baza danych &gt; &apos;Importuj bazę danych KeePass 1...&apos;.
+Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej bazy danych za pomocą starej wersji KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1277,6 +2268,35 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <translation>Niewspierana wersja bazy danych KeePass.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Główna</translation>
     </message>
@@ -1288,129 +2308,141 @@ Czy chcesz ją otworzyć mimo to?</translation>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Błędny klucz lub baza danych jest uszkodzona.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>To nie baza danych KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Niewspierana wersja bazy danych KeePass.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Błędny klucz lub baza danych jest uszkodzona.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nie mogę wyliczyć głównego klucza</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nie można wywołać wyzwania-odpowiedzi.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Wybrany plik jest starą bazą danych KeePassX 1 (.kdb).
-
-Możesz zaimportować ją przez wybranie Baza danych &gt; &apos;Importuj bazę danych KeePass 1...&apos;.
-Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej bazy danych za pomocą starej wersji KeePassX 0.4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Nie można wywołać wyzwania-odpowiedzi.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Nie mogę wyliczyć głównego klucza</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Błąd krytyczny podczas testowania funkcji kryptograficznych.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Błąd</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Nie można utworzyć pliku blokady. Tryb pojedynczej instancji jest wyłączony.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Inna instancja KeePassXC jest już uruchomiona.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Istniejący plik blokady pojedynczego wystąpienia jest nieprawidłowy. Uruchamianie nowego wystąpienia.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Otwieranie bazy danych</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Ustawienia bazy danych</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Skopiuj użytkownika do schowka</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Skopiuj hasło do schowka</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Pokaż pasek narzędziowy</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>Tylko do odczytu</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Pokaż/ukryj okno</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Baza danych KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Wszystkie pliki</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Zapisz naprawioną bazę danych</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Istniejący plik blokady pojedynczego wystąpienia jest nieprawidłowy. Uruchamianie nowego wystąpienia.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Błąd przy zapisie bazy danych.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Nie można utworzyć pliku blokady. Tryb pojedynczej instancji jest wyłączony.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Inna instancja KeePassXC jest już uruchomiona.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Błąd krytyczny podczas testowania funkcji kryptograficznych.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Błąd</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Baza danych</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Ostatnie bazy danych</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importuj</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>W&amp;pisy</translation>
     </message>
@@ -1419,12 +2451,16 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Skopiuj atry&amp;but do schowka</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupy</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>Wi&amp;dok</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Narzędzia</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1435,6 +2471,10 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>&amp;O programie</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>Ot&amp;wórz bazę danych...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Zapisz bazę danych</translation>
     </message>
@@ -1475,24 +2515,24 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>U&amp;suń grupę</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Ustawienia bazy &amp;danych</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>&amp;Zapisz bazę danych jako...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Sklonuj wpis</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Zmień główne &amp;hasło...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Hasło jednorazowe zależne od czasu – TOTP</translation>
+        <source>&amp;Database settings</source>
+        <translation>Ustawienia bazy &amp;danych</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Skopiuj &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Ustawienia bazy danych</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Pokaż TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Sklonuj wpis</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1503,14 +2543,26 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>Skopi&amp;uj użytkownika</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Skopiuj użytkownika do schowka</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Sko&amp;piuj hasło</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Skopiuj hasło do schowka</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ustawienia</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Generator hasła</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Wykonaj auto-uzupełnianie</translation>
     </message>
@@ -1527,165 +2579,210 @@ Jest to migracja w jedną stronę. Nie będzie można otworzyć importowanej baz
         <translation>&amp;Tytuł</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notatki</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Generator hasła</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Wyczyść historię</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Eksportuj do pliku CSV...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Baza danych</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importuj bazę danych KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importuj</translation>
+        <source>Import CSV file...</source>
+        <translation>Importuj plik CSV...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Narzędzia</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Na&amp;praw bazę danych...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Pokaż TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Ustaw TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Skopiuj &amp;TOTP</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Opróżnij kosz</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Wyczyść historię</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Błąd dostępu pliku konfiguracyjnego %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Zakończ KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Proszę dotknąć przycisku na twoim YubiKey!</translation>
+        <source>read-only</source>
+        <translation>Tylko do odczytu</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Pomoc</translation>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>Ot&amp;wórz bazę danych...</translation>
+        <source>Toggle window</source>
+        <translation>Pokaż/ukryj okno</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>&amp;Zapisz bazę danych jako...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Zakończ KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Zmień główne &amp;hasło...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Baza danych KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Eksportuj do pliku CSV...</translation>
+        <source>All files</source>
+        <translation>Wszystkie pliki</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importuj bazę danych KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Otwieranie bazy danych</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importuj plik CSV...</translation>
+        <source>Save repaired database</source>
+        <translation>Zapisz naprawioną bazę danych</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Na&amp;praw bazę danych...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Błąd przy zapisie bazy danych.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Ustaw TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Proszę dotknąć przycisku na twoim YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>P&amp;okaż powiadomienie, gdy wymagane są poświadczenia</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Sortuj dopasowane wpisy według &amp;użytkownika</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>U&amp;suń wszystkie przechowywane uprawnienia z wpisów w aktywnej bazie danych</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Zaawansowane</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Zawsze zezwalaj na d&amp;ostęp do wpisów</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Zawsze zezwalaj na a&amp;ktualizowanie wpisów</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Szuk&amp;aj we wszystkich otwartych bazach danych dopasowanych wpisów</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Port HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Port domyślny: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Żąda&amp;j odblokowania bazy danych, jeżeli jest zablokowana</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Sortuj dopasowane wpisy według &amp;tytułu</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC będzie nasłuchiwać ten port na 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Nie można powiązać do uprzywilejowanych portów</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Nie można powiązać do uprzywilejowanych portów poniżej 1024!
-Używam domyślnego portu 19455.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>U&amp;suń wszystkie współdzielone klucze szyfrujące z aktywnej bazy danych</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Zwracaj zaawansowane pola ciągów znaków, które zaczynają się od &quot;KPH: &quot;</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Automatyczne tworzenie albo aktualizowanie pól ciągów znaków nie jest obsługiwane.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Dialog</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1696,6 +2793,15 @@ Używam domyślnego portu 19455.</translation>
         <translation>Włącz serwer KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Ogólne</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>P&amp;okaż powiadomienie, gdy wymagane są poświadczenia</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Zwracaj tylko najlepsze dopasowania wpisów dla URL zamiast wszystkich wpisów całej domeny.</translation>
     </message>
@@ -1704,6 +2810,10 @@ Używam domyślnego portu 19455.</translation>
         <translation>Z&amp;wróć tylko najlepiej pasujące wpisy</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Żąda&amp;j odblokowania bazy danych, jeżeli jest zablokowana</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Tylko wpisy z tym samym schematem (http://, https://, ftp://, ...) są zwracane.</translation>
     </message>
@@ -1712,33 +2822,114 @@ Używam domyślnego portu 19455.</translation>
         <translation>&amp;Dopasuj schematy adresów URL</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Sortuj dopasowane wpisy według &amp;użytkownika</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Sortuj dopasowane wpisy według &amp;tytułu</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>U&amp;suń wszystkie współdzielone klucze szyfrujące z aktywnej bazy danych</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>U&amp;suń wszystkie przechowywane uprawnienia z wpisów w aktywnej bazie danych</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Generator hasła</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Zaawansowane</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Zawsze zezwalaj na d&amp;ostęp do wpisów</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Zawsze zezwalaj na a&amp;ktualizowanie wpisów</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Tylko wybrana baza danych musi być podłączona do klienta.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Poniższe opcje mogą być niebezpieczne!
-Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Szuk&amp;aj we wszystkich otwartych bazach danych dopasowanych wpisów</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Automatyczne tworzenie albo aktualizowanie pól ciągów znaków nie jest obsługiwane.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Zwracaj zaawansowane pola ciągów znaków, które zaczynają się od &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Port HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Port domyślny: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC będzie nasłuchiwać ten port na 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Nie można powiązać do uprzywilejowanych portów</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Nie można powiązać do uprzywilejowanych portów poniżej 1024!
+Używam domyślnego portu 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Hasło:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>siła</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Typy znaków</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
-        <translation>Duże litery</translation>
+        <translation>Wielkie litery</translation>
     </message>
     <message>
         <source>Lower Case Letters</source>
@@ -1753,38 +2944,50 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
         <translation>Znaki specjalne</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Rozszerzony ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Wyklucz podobnie wyglądające znaki</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Zaakceptuj</translation>
+        <source>Pick characters from every group</source>
+        <translation>Wybierz znaki ze wszystkich grup</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Długość:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>siła</translation>
+        <source>Passphrase</source>
+        <translation>Tekst szyfrujący</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropia</translation>
+        <source>Wordlist:</source>
+        <translation>Lista słów:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Długość:</translation>
+        <source>Word Count:</source>
+        <translation>Liczba słów:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Wybierz znaki ze wszystkich grup</translation>
+        <source>Word Separator:</source>
+        <translation>Separator słów:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Wygeneruj</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Skopiuj</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Zaakceptuj</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Zamknij</translation>
     </message>
@@ -1802,51 +3005,270 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Kiepska</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Słaba</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Dobra</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Znakomita</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Hasło</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Rozszerzony ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Tekst szyfrujący</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Lista słów:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Liczba słów:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Separator słów:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Skopiuj</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Ścieżka bazy danych.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Wyodrębnij i drukuj zawartość bazy danych.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Ścieżka bazy danych do wyodrębnienia.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nazwa polecenia do wykonania.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Wypisz wpisy bazy danych.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Ścieżka grupy do wymienienia. Domyślna to /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Połącz dwie bazy danych.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Ścieżka bazy danych, do której scalić.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Ścieżka bazy danych, z której scalić.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nazwa wpisu do pokazania.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Urządzenie NULL</translation>
@@ -1870,8 +3292,28 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
         <translation>brak cytatu zamknięcia</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>WEWNĘTRZNE - przekroczono dolny limit unget</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1890,14 +3332,22 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
         <translation>Hasło</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notatki</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Integracja z przeglądarką</translation>
     </message>
@@ -1913,6 +3363,10 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
         <source>Passive</source>
         <translation>Pasywny</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agent SSH</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1951,8 +3405,8 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Rozróżniaj wielkość znaków</translation>
+        <source>Search...</source>
+        <translation>Szukaj...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1963,8 +3417,8 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
         <translation>Wyczyść</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Szukaj...</translation>
+        <source>Case Sensitive</source>
+        <translation>Rozróżniaj wielkość znaków</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1974,50 +3428,6 @@ Zmieniaj je tylko wtedy, gdy wiesz, co robisz.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Współdzielony klucz szyfrujący o nazwie &quot;%1&quot; już istnieje.
-Czy chcesz go nadpisać?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Czy chcesz uaktualnić informację w %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Aktywna baza danych jest zablokowana!
-Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Pomyślnie usunięto %1 szyfrowanie-%2 z ustawień KeePassX/HTTP.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nie znaleziono współdzielonych kluczy szyfrujących w ustawieniach KeePassHTTP.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Aktywna baza danych nie zawiera wpisu z ustawieniami KeePassHTTP.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Usuwanie przechowywanych uprawnień...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Zaniechaj</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Udanie usunięto uprawnienia z %1 %2.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Aktywna baza danych nie zawiera wpisu z uprawnieniami.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Nowe żądanie skojarzenia klucza</translation>
     </message>
@@ -2034,33 +3444,77 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
         <translation>KeePassXC: Nadpisać istniejący klucz?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Współdzielony klucz szyfrujący o nazwie &quot;%1&quot; już istnieje.
+Czy chcesz go nadpisać?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Aktualizacja wpisu</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Czy chcesz uaktualnić informację w %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Baza danych zablokowana!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Aktywna baza danych jest zablokowana!
+Proszę odblokować wybraną bazę albo wybrać inną, która jest odblokowana.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Usunięto klucze z bazy danych</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Nie znaleziono kluczy</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Nie znaleziono współdzielonych kluczy szyfrujących w ustawieniach KeePassHTTP.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Ustawienia niedostępne!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Aktywna baza danych nie zawiera wpisu z ustawieniami KeePassHTTP.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Usuwanie przechowywanych uprawnień...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Zaniechaj</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Usunięto uprawnienia</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Nie znaleziono wpisu z uprawnieniami!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Aktywna baza danych nie zawiera wpisu z uprawnieniami.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2070,7 +3524,7 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
     </message>
     <message>
         <source>General</source>
-        <translation>Główne</translation>
+        <translation>Ogólne</translation>
     </message>
     <message>
         <source>Security</source>
@@ -2084,10 +3538,26 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Ustawienia podstawowe</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Uruchom tylko jedną instancję KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Pamiętaj ostatnią bazę danych</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Zapamiętaj ostatnie pliki klucze i klucze sprzętowe</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Załaduj poprzednie bazy danych podczas uruchomienia</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Automatycznie zapisz przy wyjściu</translation>
     </message>
@@ -2096,20 +3566,28 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
         <translation>Automatycznie zapisz po każdej zmianie</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automatycznie przeładuj bazę danych, gdy zostanie zmodyfikowana zewnętrznie</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Zminimalizuj po skopiowaniu do schowka</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimalizuj okno podczas uruchomienia aplikacji</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Użyj ikony grupy podczas tworzenia wpisu</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Globalny skrót auto-uzupełnianie</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Nie zaznaczaj bazy danych jako zmodyfikowanej dla zmian innych niż dane (np. rozwijanie grup)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Język</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,66 +3598,60 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
         <translation>Schowaj okno do zasobnika podczas minimalizacji</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Załaduj poprzednie bazy danych podczas uruchomienia</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automatycznie przeładuj bazę danych, gdy zostanie zmodyfikowana zewnętrznie</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Schowaj okno do zasobnika zamiast wyłączenia aplikacji</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimalizuj okno podczas uruchomienia aplikacji</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Ustawienia podstawowe</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Zapamiętaj ostatnie pliki klucze i klucze sprzętowe</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Nie zaznaczaj bazy danych jako zmodyfikowanej dla zmian innych niż dane (np. rozwijanie grup)</translation>
+        <source>Language</source>
+        <translation>Język</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Auto-uzupełnianie</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Wykorzystaj tytuł wpisu oraz URL do dopasowania okien dla globalnego auto-uzupełniania</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Zawsze pytaj przed wykonaniem auto-uzupełninia</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Globalny skrót auto-uzupełnianie</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Opóźnienie auto-uzupełniania</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Uruchom tylko jedną instancję KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Limity czasowe</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Wyczyść schowek po</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>s</translation>
     </message>
     <message>
@@ -2187,8 +3659,12 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
         <translation>Zablokuj bazę danych po nieaktywności</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Domyślnie pokazuj hasła</translation>
+        <source>Convenience</source>
+        <translation>Poręczność</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Zablokuj bazy danych, gdy sesja jest zablokowana albo pokrywa jest zamknięta</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2199,16 +3675,16 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
         <translation>Nie wymagaj powtarzania hasła, gdy jest widoczne</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Limity czasowe</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Domyślnie pokazuj hasła</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Poręczność</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Zablokuj bazy danych, gdy sesja jest zablokowana albo pokrywa jest zamknięta</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2230,6 +3706,14 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
         <translation>Klucz:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Użyj niestandardowych ustawień</translation>
     </message>
@@ -2255,6 +3739,7 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>s</translation>
     </message>
 </context>
@@ -2322,88 +3807,40 @@ nadaj unikatową nazwę do zidentyfikowania i zaakceptuj.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>ścieżka do pliku z ustawieniami</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>plik klucza bazy danych</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - wieloplatformowy menedżer haseł</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>odczytaj hasło bazy danych z stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nazwy plików baz danych haseł do otwarcia (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Skopiuj hasło do schowka</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Ścieżka bazy danych.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Użyj graficznego interfejsu, aby odblokować bazę danych.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Nazwa wpisu do wycięcia.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Wyodrębnij i drukuj zawartość bazy danych.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Ścieżka bazy danych do wyodrębnienia.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nazwa polecenia do wykonania.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Wypisz wpisy bazy danych.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Ścieżka grupy do wymienienia. Domyślna to /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Pokaż UUID-y wpisów i grup.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Połącz dwie bazy danych.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - wieloplatformowy menedżer haseł</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Ścieżka bazy danych, do której scalić.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nazwy plików baz danych haseł do otwarcia (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Ścieżka bazy danych, z której scalić.</translation>
+        <source>path to a custom config file</source>
+        <translation>ścieżka do pliku z ustawieniami</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Użyj tego samego hasła dla obu plików bazy danych.</translation>
+        <source>key file of the database</source>
+        <translation>plik klucza bazy danych</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Pokaż hasło.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>odczytaj hasło bazy danych z stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nazwa wpisu do pokazania.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_pt_BR.ts b/share/translations/keepassx_pt_BR.ts
index 1ea54d854..c842ae335 100644
--- a/share/translations/keepassx_pt_BR.ts
+++ b/share/translations/keepassx_pt_BR.ts
@@ -10,14 +10,34 @@
         <translation>Sobre</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Reporte erros em: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC é distribuído nos termos da Licença Pública Geral (GPL), versão 2 ou (à sua escolha) versão 3, do GNU.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Mantedores do Projeto:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Colaboradores</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Ver Colaborações no GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Informações de Depuração</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Inclua as informações abaixo quando reportar um erro:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Copiar para a área de transferência</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revisão: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Bibliotecas:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Extensões habilitadas:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Reporte erros em: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC é distribuído nos termos da Licença Pública Geral (GPL), versão 2 ou (à sua escolha) versão 3, do GNU.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Mantedores do Projeto:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Ver Colaborações no GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Inclua as informações abaixo quando reportar um erro:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Confirmar Acesso</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Lembrar esta escolha</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 solicitou acesso a senhas para o(s) seguinte(s) iten(s).
 Selecione se deseja permitir o acesso.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Confirmar Acesso</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Habilitar Agente SSH (requer reinicialização)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Auto-Digitação - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Digitação</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>A sintaxe da sua sequência de Auto-Digitação está incorreta!</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-Digitação contém um tempo de espera muito longo. Você tem certeza que deseja continuar?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Selecione se deseja permitir o acesso.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Digitação - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Escolha uma entrada para Auto-Digitar:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Auto-Digitação - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>KeePassXC-Browser Confirmar Acesso</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Lembrar esta escolha</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permitir</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Negar</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 solicitou acesso a senhas para o(s) seguinte(s) iten(s).
+Selecione se deseja permitir o acesso.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Isso é necessário para acessar os seus bancos de dados usando o KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Habilitar integração do KeepassXC com navegadores</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Habilitar integração para estes navegadores:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </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>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Desconectar todos os navegadores</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Criação automática ou atualizações não são suportadas para os valores dos campos.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Mostrar também campos avançados que começam com &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Navegar...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>Arquivos Executáveis (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Nova associação de chaves requisitada</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Salvar e permitir acesso</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Substituir chave existente?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Atualizar entrada</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Banco de dados bloqueado!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>A base de dados ativa está bloqueada!
+Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Configurações não disponíveis!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nenhuma chave localizada</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Chaves removidas do banco de dados</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Removendo permissões armazenadas...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissões removidas</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Nenhuma entrada com permissões localizada!</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>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Repita senha:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Arquivo-Chave</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Navegar</translation>
     </message>
@@ -157,12 +465,20 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Criar</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Atualizar</translation>
+    </message>
+    <message>
         <source>Key files</source>
-        <translation>Arquivos-Chave</translation>
+        <translation>Arquivos-chave</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos os Arquivos</translation>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
         <source>Create Key File...</source>
@@ -177,6 +493,10 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Escolha um arquivo-chave</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Senha vazia</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Você realmente quer usar uma sequência vazia como senha?</translation>
     </message>
@@ -191,20 +511,15 @@ Selecione se deseja permitir o acesso.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Arquivo-Chave</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Atualizar</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Senha vazia</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Opções de Clonagem</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Substituir o usuário e senha com referências</translation>
     </message>
@@ -225,10 +544,6 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Copy history</source>
         <translation>Copiar histórico</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -258,15 +573,15 @@ Selecione se deseja permitir o acesso.</translation>
     </message>
     <message>
         <source>Fields are separated by</source>
-        <translation type="unfinished"/>
+        <translation>Campos são separados por</translation>
     </message>
     <message>
         <source>Comments start with</source>
-        <translation type="unfinished"/>
+        <translation>Comentários começam com</translation>
     </message>
     <message>
         <source>First record has field names</source>
-        <translation type="unfinished"/>
+        <translation>O primeiro registro contém os nomes dos campos</translation>
     </message>
     <message>
         <source>Number of headers line to discard</source>
@@ -282,15 +597,15 @@ Selecione se deseja permitir o acesso.</translation>
     </message>
     <message>
         <source>Column layout</source>
-        <translation type="unfinished"/>
+        <translation>Organização das colunas</translation>
     </message>
     <message>
         <source>Not present in CSV file</source>
-        <translation type="unfinished"/>
+        <translation>Não existe no arquivo CSV</translation>
     </message>
     <message>
         <source>Empty fieldname </source>
-        <translation type="unfinished"/>
+        <translation>Nome de campo vazio</translation>
     </message>
     <message>
         <source>column </source>
@@ -325,10 +640,6 @@ Selecione se deseja permitir o acesso.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importar arquivo CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
@@ -339,17 +650,17 @@ Selecione se deseja permitir o acesso.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n byte(s), </numerusform><numerusform>%n byte(s), </numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n linha(s), </numerusform><numerusform>%n linha(s), </numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>colunas</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n coluna(s)</numerusform><numerusform>%n coluna(s)</numerusform></translation>
     </message>
 </context>
 <context>
@@ -371,16 +682,39 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Navegar</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Atualizar</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Não foi possível abrir o banco de dados.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Não foi possível abrir o arquivo-chave</translation>
+        <translation>Não foi possível abrir arquivo-chave</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos os arquivos</translation>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
         <source>Key files</source>
@@ -390,14 +724,6 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Select key file</source>
         <translation>Escolha o arquivo-chave</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Atualizar</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -414,14 +740,14 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Não foi possível abrir arquivo-chave</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Banco de dados aberto com sucesso. Nada para fazer.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Não foi possível abrir o banco de dados.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Banco de dados aberto com sucesso. Nada para fazer.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
@@ -439,67 +765,148 @@ Você pode salvá-lo agora.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nome do banco de dados:</translation>
+        <source>General</source>
+        <translation>Geral</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Descrição do banco de dados:</translation>
+        <source>Encryption</source>
+        <translation>Encriptação</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Rodadas de transformação:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Usuário padrão:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Benchmark</translation>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Máx. itens no histórico:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Tamanho máx. do histórico:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Usar lixeira</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>AES:  256 Bit   (default)</source>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES: 256 Bit (padrão)</translation>
+    </message>
     <message>
         <source>Twofish:  256 Bit</source>
+        <translation>Twofish: 256 Bit</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Rodadas de transformação:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Algorithm:</source>
+        <source>Memory Usage:</source>
+        <translation>Uso de Memória:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Paralelismo:</translation>
+    </message>
+    <message>
+        <source> thread</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nome do banco de dados:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descrição do banco de dados:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Usuário padrão:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Configurações de Histórico</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Máx. itens no histórico:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Tamanho máx. do histórico:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Usar lixeira</translation>
+    </message>
+</context>
+<context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
-        <translation>Raiz</translation>
+        <comment>Root group</comment>
+        <translation>Raíz</translation>
     </message>
     <message>
         <source>KeePass 2 Database</source>
-        <translation>Banco de Dados KeePass 2</translation>
+        <translation>Banco de dados Keepass 2</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos os arquivos</translation>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
         <source>Open database</source>
@@ -510,22 +917,48 @@ Você pode salvá-lo agora.</translation>
         <translation>Arquivo não localizado!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Abrir banco de dados KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Não foi possível abrir o banco de dados.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Banco de dados KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Abrir arquivo CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Arquivo CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Todos os arquivos (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Juntar banco de dados</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir banco de dados KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Banco de dados KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Fechar?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot; está em modo de edição.
+Descartar alterações e fechar mesmo assim?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Salvar alterações?</translation>
     </message>
@@ -537,13 +970,25 @@ Salvar alterações?</translation>
     </message>
     <message>
         <source>Writing the database failed.</source>
-        <translation>Escrever no banco de dados falhou.</translation>
+        <translation>Escrita do banco de dados falhou.</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>Senhas</translation>
     </message>
     <message>
         <source>Save database as</source>
         <translation>Salvar banco de dados como</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Exportar banco de dados para arquivo CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Falha ao gravar arquivo CSV.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Novo banco de dados</translation>
     </message>
@@ -562,12 +1007,6 @@ Please press cancel to finish your changes or discard them.</source>
 Por favor, aperte cancelar para finalizar suas alterações ou descartá-las.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Esse banco de dados nunca foi salvo.
-Você pode salvar o banco de dados ou parar de trancá-lo.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -575,72 +1014,16 @@ Otherwise your changes are lost.</source>
 Você deseja salvar o banco de dados antes de travá-lo?
 Do contrário, suas alterações serão perdidas.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>&quot;%1&quot; está em modo de edição.
-Descartar alterações e fechar mesmo assim?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Exportar banco de dados para arquivo CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Arquivo CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Falha ao gravar arquivo CSV.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Não foi possível abrir o banco de dados.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Juntar banco de dados</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>A base de dados que você está tentando abrir está bloqueada por outra instância de KeePassXC.
-Mesmo assim deseja salvá-la?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Senhas</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Banco de dados já aberto</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>O banco de dados que você está tentando abrir está bloqueada por outra instância do KeePassXC.
-
-Mesmo assim deseja salvá-la?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Abrir somente leitura</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Pesquisando...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
-        <translation>Alterar chave mestra</translation>
+        <translation>Alterar chave-mestra</translation>
     </message>
     <message>
         <source>Delete entry?</source>
@@ -659,36 +1042,44 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Você realmente quer apagar %1 entradas para sempre?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Mover entrada para a lixeira?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Pretende realmente mover a entrada &quot;%1&quot; para a lixeira?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Mover entradas para lixeira?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Você realmente deseja mover %n entrada para a lixeira?</numerusform><numerusform>Você realmente deseja mover %n entradas para a lixeira?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Apagar grupo?</translation>
+        <source>Execute command?</source>
+        <translation>Executar comando?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Você realmente quer apagar o grupo &quot;%1&quot; para sempre?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Você quer realmente executar o comando seguinte?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular chave mestra</translation>
+        <source>Remember my choice</source>
+        <translation>Lembrar minha escolha</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Mover entrada para a lixeira?</translation>
+        <source>Delete group?</source>
+        <translation>Apagar grupo?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Pretende realmente mover a entrada &quot;%1&quot; para a lixeira?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Você realmente quer apagar o grupo &quot;%1&quot; para sempre?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Pesquisando...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave mestre</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1098,8 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Sem Resultados</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Executar comando?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Você quer realmente executar o comando seguinte?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Lembrar minha escolha</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Recarregar Automaticamente Pedido</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1110,9 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Juntar Pedido</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>A base de dados foi alterada e tem alterações não gravadas. Deseja juntar as suas alterações?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1128,89 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Gerar Token TOTP</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expiração</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de usuário</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Auto-Digitação</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributos</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Janela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisar</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEGIDO]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Desabilitado</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Habilitado</translation>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1237,30 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Histórico</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/d</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation>(criptografado)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Escolha uma chave privada</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Este arquivo é muito grande para ser uma chave privada</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Falha ao abrir chave privada</translation>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Histórico de Entradas</translation>
     </message>
@@ -794,22 +1281,20 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Novo atributo</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Selecionar arquivo</translation>
+        <source>Confirm Remove</source>
+        <translation>Confirmar Exclusão</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Não foi possível abrir o arquivo</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Você tem certeza que deseja remover este atributo?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Salvar anexo</translation>
+        <source>[PROTECTED]</source>
+        <translation>[PROTEGIDO]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Não foi possível salvar o anexo:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation>Aperte revelar para ver ou editar</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1302,16 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semana(s)</numerusform><numerusform>%n semana(s)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mês</numerusform><numerusform>%n mese(s)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 ano</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1328,6 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Remover</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Anexos</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Salvar</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Editar Nome</translation>
     </message>
@@ -882,6 +1339,10 @@ Mesmo assim deseja salvá-la?</translation>
         <source>Reveal</source>
         <translation>Revelar</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1351,18 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Habilitar Auto-Digitação para esta entrada</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Herdar sequência pré-definida de Auto-Digitação do &amp;grupo</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Usar sequência de Auto-Digitação personalizada:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Associações de Janela</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1375,6 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Título da Janela:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Herdar sequência pré-definida de Auto-Digitação do &amp;grupo</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usar sequência de Auto-Digitação personalizada:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Usar se&amp;quência pré-definida</translation>
     </message>
@@ -917,10 +1382,6 @@ Mesmo assim deseja salvá-la?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Definir sequência &amp;personalizada:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Associações de Janela</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1405,8 @@ Mesmo assim deseja salvá-la?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Título:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nome de Usuário:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1417,104 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Repetir:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Título:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expira em</translation>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Pré-definidos</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notas:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nome de Usuário:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira em</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>segundos</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Chave pública</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentário</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/d</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Chave privada</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Arquivo externo</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Navegar...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Anexo</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Adicionar ao agente</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Remover do agente</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1015,7 +1556,7 @@ Mesmo assim deseja salvá-la?</translation>
     <name>EditGroupWidgetMain</name>
     <message>
         <source>Name</source>
-        <translation>Nom</translation>
+        <translation>Nome</translation>
     </message>
     <message>
         <source>Notes</source>
@@ -1027,7 +1568,7 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Buscar</translation>
+        <translation>Pesquisar</translation>
     </message>
     <message>
         <source>Auto-Type</source>
@@ -1045,6 +1586,14 @@ Mesmo assim deseja salvá-la?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Usar ícone padrão</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Usar ícone &amp;personalizado</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Adicionar ícone personalizado</translation>
     </message>
@@ -1053,36 +1602,36 @@ Mesmo assim deseja salvá-la?</translation>
         <translation>Excluir ícone personalizado</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Baixar favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Não foi possível obter favicon.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
     <message>
         <source>All files</source>
-        <translation>Todos os arquivos</translation>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
         <source>Select Image</source>
         <translation>Selecionar imagem</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Baixar favicon</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Não foi possível obter favicon.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Não foi possível ler ícone</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Usar ícone padrão</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Usar ícone &amp;personalizado</translation>
+        <source>Custom icon already exists</source>
+        <translation>Ícone personalizado já existe</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1641,6 @@ Mesmo assim deseja salvá-la?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1665,94 @@ Mesmo assim deseja salvá-la?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - Clone</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamanho</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Salvar</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Selecionar arquivos</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirmar Exclusão</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Salvar anexos</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1781,11 @@ Mesmo assim deseja salvá-la?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -1171,11 +1801,6 @@ Mesmo assim deseja salvá-la?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1810,17 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1883,358 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave mestre</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Chave errada ou base de dados corrompida.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave mestre</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave mestre</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Cifra desconhecida</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Não foi possível calcular a chave mestre</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Não é um banco de dados KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1273,7 +2261,36 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
     <message>
         <source>Unsupported KeePass database version.</source>
-        <translation>Versão do banco de dados KeePass não suportada.</translation>
+        <translation>Versão não suportada do banco de dados KeePass.</translation>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root</source>
@@ -1281,132 +2298,147 @@ Mesmo assim deseja salvá-la?</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave mestra</translation>
+        <translation>Não foi possível calcular a chave mestre</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Chave errada ou base de dados corrompida.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Não é um banco de dados KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Versão não suportada do banco de dados KeePass.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Chave errada ou arquivo de banco de dados está corrompido.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave mestre</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <source>Incorrect group creation time field size</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Não foi possível calcular a chave mestre</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Erro fatal enquanto testava as funções criptográficas.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Erro</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Incorrect group level field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
+        <source>Invalid group field type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Abrir banco de dados</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Configurações do Banco de Dados</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Copiar nome de usuário para área de transferência</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Copiar senha para área de transferência</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Configurações</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Mostrar barra de ferramentas</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>somente leitura</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Alternar Janela</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Banco de dados Keepass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos arquivos</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Salvar banco de dados reparado</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Escrita do banco de dados falhou.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erro fatal enquanto testava as funções criptográficas.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erro</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>Banco de &amp;dados</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Bancos de dados recentes</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importar</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>E&amp;ntradas</translation>
     </message>
@@ -1415,12 +2447,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Copiar at&amp;ributo para área de transferência</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Ver</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Ferramentas</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1431,6 +2467,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Sobre</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Salvar base de dados</translation>
     </message>
@@ -1471,24 +2511,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Apagar grupo</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Definições da base de dados</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Clonar entrada</translation>
+        <source>Change &amp;master key...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Senha temporária de uso único</translation>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Definições da base de dados</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Copiar &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Configurações do Banco de Dados</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Mostrar TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1499,14 +2539,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Copiar nome de &amp;usuário</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copiar nome de usuário para área de transferência</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Cop&amp;iar senha</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copiar senha para área de transferência</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Gerador de Senha</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Executar escrita automática</translation>
     </message>
@@ -1523,165 +2575,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Título</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notas</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Gerador de Senha</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Limpar histórico</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>Banco de &amp;dados</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importar banco de dados KeePass1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importar</translation>
+        <source>Import CSV file...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Ferramentas</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Re&amp;parar banco de dados...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Mostrar TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Configurar TOTP...</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Esvaziar lixeira</translation>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copiar &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>Esvaziar &amp;lixeira</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Limpar histórico</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read-only</source>
+        <translation>somente leitura</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>Configurações</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>Alternar Janela</translation>
+    </message>
+    <message>
         <source>Quit KeePassXC</source>
         <translation>Fechar KeePassXC</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation type="unfinished"/>
+        <source>KeePass 2 Database</source>
+        <translation>Banco de dados Keepass 2</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <source>All files</source>
+        <translation>Todos arquivos</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation type="unfinished"/>
+        <source>Open database</source>
+        <translation>Abrir banco de dados</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation type="unfinished"/>
+        <source>Save repaired database</source>
+        <translation>Salvar banco de dados reparado</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
+        <source>Writing the database failed.</source>
+        <translation>Escrita do banco de dados falhou.</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
         <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
     <message>
-        <source>&amp;Export to CSV file...</source>
+        <source>Invalid key file, expecting an OpenSSH key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
+        <source>PEM boundary mismatch</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Import CSV file...</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Set up TOTP...</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>OptionDialog</name>
     <message>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>Found zero keys</source>
+        <translation>Nenhuma chave encontrada</translation>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>M&amp;ostrar uma notificação quando as credenciais forem solicitadas</translation>
+        <source>Failed to read public key.</source>
+        <translation>Falha ao ler chave pública</translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordenar entradas coincidentes por nome de &amp;usuário</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>R&amp;emover todas as permissões armazenadas de entradas na base de dados ativa</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
+        <source>Unknown cipher: </source>
+        <translation>Cifra desconhecida:</translation>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permitir sempre &amp;acesso as entradas</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permitir sempre &amp;atualizar as entradas</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Procurar em todas as base de dados abertas por entradas semel&amp;hantes</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Porta HTTP:</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Porta padrão: 19455</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </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>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordenar &amp;entradas por título</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC irá escutar esta porta em 127.0.0.1</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Não é possível ligar a portas privilegiadas</translation>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Não é possível ligar a portas privilegiadas abaixo de 1024!
-Usando porta padrão 19455.</translation>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;emover todas as chaves criptografadas compartilhadas da base de dados ativa</translation>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>&amp;Mostrar também campos avançados que começam com &quot;KPH: &quot;</translation>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>OptionDialog</name>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Criação automática ou atualizações não são suportadas para os valores dos campos.</translation>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1692,6 +2789,15 @@ Usando porta padrão 19455.</translation>
         <translation>Habilitar servidor KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>M&amp;ostrar uma notificação quando as credenciais forem solicitadas</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation type="unfinished"/>
     </message>
@@ -1700,6 +2806,10 @@ Usando porta padrão 19455.</translation>
         <translation type="unfinished"/>
     </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>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation type="unfinished"/>
     </message>
@@ -1708,28 +2818,110 @@ Usando porta padrão 19455.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Ordenar entradas coincidentes por nome de &amp;usuário</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Ordenar &amp;entradas por título</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>R&amp;emover todas as chaves criptografadas compartilhadas da base de dados ativa</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>R&amp;emover todas as permissões armazenadas de entradas na base de dados ativa</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Gerador de Senha</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Permitir sempre &amp;acesso as entradas</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Permitir sempre &amp;atualizar as entradas</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Procurar em todas as base de dados abertas por entradas semel&amp;hantes</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Criação automática ou atualizações não são suportadas para os valores dos campos.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&amp;Mostrar também campos avançados que começam com &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Porta HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Porta padrão: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC irá escutar esta porta em 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Não é possível ligar a portas privilegiadas</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Não é possível ligar a portas privilegiadas abaixo de 1024!
+Usando porta padrão 19455.</translation>
+    </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Senha:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>força</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
         <source>Character Types</source>
-        <translation>Tipos de Caracteres</translation>
+        <translation>Tipo de Caracteres</translation>
     </message>
     <message>
         <source>Upper Case Letters</source>
@@ -1748,38 +2940,50 @@ Change them only if you know what you are doing.</source>
         <translation>Caracteres Especiais</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
-        <translation>Excluir caracteres similares</translation>
+        <translation>Excluir caracteres semelhantes</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Aceitar</translation>
+        <source>Pick characters from every group</source>
+        <translation>Selecione caracteres de todos os grupos</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Tamanho:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>força</translation>
+        <source>Passphrase</source>
+        <translation>Senha</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropia</translation>
+        <source>Wordlist:</source>
+        <translation>Lista de palavras:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Tamanho:</translation>
+        <source>Word Count:</source>
+        <translation>Número de Palavras:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Selecione caracteres de todos os grupos</translation>
+        <source>Word Separator:</source>
+        <translation>Separador de Palavras:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Gerar</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Aceitar</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -1797,51 +3001,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Pobre</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Fraco</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Bom</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Excelente</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Senha</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
+        <source>Database hash not available</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Senha</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Lista de palavras:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Número de Palavras:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Separador de Palavras:</translation>
+        <source>Action cancelled or denied</source>
+        <translation>Ação cancelada ou negada</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>Nenhuma URL informada</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>Nenhum login encontrado</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Erro desconhecido</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation>Adicionar uma nova entrada ao banco de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Caminho do banco de dados</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation>Arquivo-chave do banco de dados.</translation>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>caminho</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation>Usuário para a entrada.</translation>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>usuário</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL para a entrada.</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>tamanho</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation>Caminho da entrada para adicionar.</translation>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>Caminho da entrada para copiar.</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Editar uma entrada.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Título para a entrada.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>título</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation>Caminho da entrada para editar.</translation>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Caminho do banco de dados para extração.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nome do comando para executar.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Listar entradas do banco de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Juntar dois bancos de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nome da entrada para mostrar.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation type="unfinished"/>
@@ -1864,7 +3287,27 @@ Change them only if you know what you are doing.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1884,14 +3327,22 @@ Change them only if you know what you are doing.</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Integração com o Navegador</translation>
     </message>
@@ -1907,6 +3358,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>Passivo</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>Agente SSH</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1945,8 +3400,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Diferenciar maiúsculas e minúsculas</translation>
+        <source>Search...</source>
+        <translation>Buscar...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1957,8 +3412,8 @@ Change them only if you know what you are doing.</source>
         <translation>Limpar</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Buscar...</translation>
+        <source>Case Sensitive</source>
+        <translation>Diferenciar maiúsculas e minúsculas</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1968,50 +3423,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Já existe uma chave de criptografia compartilhada com o nome &quot;%1&quot;.
-Deseja substituí-la?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Deseja atualizar as informações em %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>A base de dados ativa está bloqueada!
-Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Removido com sucesso %1 criptografia-%2 do KeePassX/Http Configurações.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nenhuma chave de criptografia compartilhada encontrada nas Configurações do KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>A base de dados ativa não contém uma entrada de Configurações KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Removendo permissões armazenadas...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Cancelar</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Foram removidas com êxito as permissões de %1 %2.</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>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Nova associação de chaves requisitada</translation>
     </message>
@@ -2028,33 +3439,77 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>KeePassXC: Substituir chave existente?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Já existe uma chave de criptografia compartilhada com o nome &quot;%1&quot;.
+Deseja substituí-la?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Atualizar entrada</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Banco de dados bloqueado!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>A base de dados ativa está bloqueada!
+Desbloqueie base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Chaves removidas do banco de dados</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Nenhuma chave localizada</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Nenhuma chave de criptografia compartilhada encontrada nas Configurações do KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Configurações não disponíveis!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>A base de dados ativa não contém uma entrada de Configurações KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Removendo permissões armazenadas...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Permissões removidas</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Nenhuma entrada com permissões localizada!</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>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2078,10 +3533,26 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Configurações Básicas</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Iniciar apenas uma única instância do KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Lembrar dos últimos bancos de dados</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Carregar bancos de dados anteriores na inicialização</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Salvar automaticamente ao sair</translation>
     </message>
@@ -2090,20 +3561,28 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>Salvar automaticamente depois de cada alteração</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Automaticamente recarregar o banco de dados quando houver modificações externas</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimizar ao copiar para área de transferência</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Iniciar programa com janela minimizada</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Usar ícone de grupo na criação da entrada</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Atalho para Auto-Digitação Global</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2114,39 +3593,27 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>Ocultar janela na bandeja de sistema quando minimizada</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Carregar bancos de dados anteriores na inicialização</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Automaticamente recarregar o banco de dados quando houver modificações externas</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Ocultar janela na bandeja de sistema em vez de sair do programa</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Iniciar programa com janela minimizada</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Configurações Básicas</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
+        <source>Dark system tray icon</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation type="unfinished"/>
+        <source>Language</source>
+        <translation>Idioma</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Auto-Digitação</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2154,26 +3621,32 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atalho para Auto-Digitação Global</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Limpar área de transferência após</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> seg</translation>
     </message>
     <message>
@@ -2181,8 +3654,12 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>Travar bancos de dados após inatividade de</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostrar senhas em texto claro por padrão</translation>
+        <source>Convenience</source>
+        <translation>Conveniência</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2193,15 +3670,15 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>Quando a senha for visível não pedir para repeti-la</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Mostrar senhas em texto claro por padrão</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniência</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
+        <source>Hide entry notes by default</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2224,6 +3701,14 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>Chave:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Usar configurações personalizadas</translation>
     </message>
@@ -2249,6 +3734,7 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> seg</translation>
     </message>
 </context>
@@ -2290,7 +3776,7 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
     </message>
     <message>
         <source>Start storing your passwords securely in a KeePassXC database</source>
-        <translation type="unfinished"/>
+        <translation>Começe a guardar suas senhas de maneira segura em um banco de dados do KeePassXC</translation>
     </message>
     <message>
         <source>Create new database</source>
@@ -2316,27 +3802,7 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>caminho para um arquivo de configuração personalizado</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>arquivo-chave do banco de dados</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - gerenciador de senhas multiplataforma</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>ler a senha do banco de dados da entrada padrão</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nome de arquivo do banco de dados de senhas a ser aberto (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2344,60 +3810,32 @@ dar-lhe um nome único para identificá-lo e aceitá-lo.</translation>
         <translation>Caminho do banco de dados</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the database to extract.</source>
-        <translation>Caminho do banco de dados para extração.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nome do comando para executar.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Listar entradas do banco de dados.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - gerenciador de senhas multiplataforma</translation>
     </message>
     <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation type="unfinished"/>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nome de arquivo do banco de dados de senhas a ser aberto (*.kdbx)</translation>
     </message>
     <message>
-        <source>Merge two databases.</source>
-        <translation>Juntar dois bancos de dados.</translation>
+        <source>path to a custom config file</source>
+        <translation>caminho para um arquivo de configuração personalizado</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation type="unfinished"/>
+        <source>key file of the database</source>
+        <translation>arquivo-chave do banco de dados</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation type="unfinished"/>
+        <source>read password of the database from stdin</source>
+        <translation>ler a senha do banco de dados da entrada padrão</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Show a password.</source>
-        <translation>Mostrar uma senha.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nome da entrada para mostrar.</translation>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_pt_PT.ts b/share/translations/keepassx_pt_PT.ts
index 0a671ed70..ed1ddbaaa 100644
--- a/share/translations/keepassx_pt_PT.ts
+++ b/share/translations/keepassx_pt_PT.ts
@@ -10,14 +10,34 @@
         <translation>Acerca</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Reporte os erros em: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC é distribuído sob os termos da GNU General Public License (GPL) versão 2 ou (em sua opção) versão 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Manutenção do projeto:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Colaboradores</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Consulte os contributos no GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Informação de depuração</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Inclua as seguintes informações sempre que reportar um erro:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Copiar para a área de transferência</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Revisão: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Distribuição: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Bibliotecas:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</translation>
         <source>Enabled extensions:</source>
         <translation>Extensões ativas:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Reporte os erros em: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC é distribuído sob os termos da GNU General Public License (GPL) versão 2 ou (em sua opção) versão 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Manutenção do projeto:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Consulte os contributos no GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Inclua as seguintes informações sempre que reportar um erro:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Distribuição: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP - Confirmar acesso</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Memorizar esta escolha</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 solicitou o acesso a palavras-passe para o(s) seguinte(s) iten(s).
 Selecione se deseja permitir o acesso.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP - Confirmar acesso</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Auto-Type - KeePassXC</source>
         <translation>Escrita automática - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Selecione se deseja permitir o acesso.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Escrita automática - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Selecionar entrada para escrita automática:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Escrita automática - KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Memorizar esta escolha</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Permitir</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Recusar</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 solicitou o acesso a palavras-passe para o(s) seguinte(s) iten(s).
+Selecione se deseja permitir o acesso.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </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 esta estiver bloqueada</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Apenas devolve as melhores entradas para o URL específico em vez das entradas para o domínio.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Apenas a base de dados selecionada tem que estar conectada a um cliente.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>A criação ou atualização dos campos de cadeias não é suportada.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Most&amp;rar campos avançados que começam com &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Procurar...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Ficheiros executáveis (*.exe);;Todos os ficheiros (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Pedido de associação de nova chave</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Guardar e permitir acesso</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Substituir chave existente?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Atualizar entrada</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Base de dados bloqueada!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>A base de dados ativa está bloqueada!
+Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Definições indisponíveis!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Nenhuma chave encontrada</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Remover chaves da base de dados</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Permissões removidas</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Não existem entradas com permissões!</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>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Repita a palavra-passe:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Ficheiro-&amp;chave</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Procurar</translation>
     </message>
@@ -157,6 +465,14 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Criar</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Pergunta de &amp;segurança</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Recarregar</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Ficheiros-chave</translation>
     </message>
@@ -177,6 +493,10 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Selecione o ficheiro-chave</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Palavra-passe vazia</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Deseja mesmo utilizar uma cadeia vazia como palavra-passe?</translation>
     </message>
@@ -191,20 +511,15 @@ Selecione se deseja permitir o acesso.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Ficheiro-&amp;chave</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Pergunta de &amp;segurança</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Recarregar</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Palavra-passe vazia</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Opções de clonagem</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Adicionar &apos; -Clone&apos; ao título</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Substituir nome de utilizador e palavra-passe por referências</translation>
     </message>
@@ -225,10 +544,6 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Copy history</source>
         <translation>Histórico de cópias</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Adicionar &apos; -Clone&apos; ao título</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Selecione se deseja permitir o acesso.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Importar ficheiro CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Erro</translation>
     </message>
@@ -340,17 +651,17 @@ Selecione se deseja permitir o acesso.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> byte, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n byte,</numerusform><numerusform>%n byte(s), </numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>linhas, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n linha,</numerusform><numerusform>%n linhas,</numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>colunas</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n coluna</numerusform><numerusform>%n colunas</numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Procurar</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Recarregar</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Pergunta de segurança:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Incapaz de abrir a base de dados.</translation>
     </message>
@@ -380,6 +699,21 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Incapaz de abrir o ficheiro-chave</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Todos os ficheiros</translation>
     </message>
@@ -391,14 +725,6 @@ Selecione se deseja permitir o acesso.</translation>
         <source>Select key file</source>
         <translation>Selecione o ficheiro-chave</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Recarregar</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Pergunta de segurança:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Selecione se deseja permitir o acesso.</translation>
         <translation>Incapaz de abrir o ficheiro-chave</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Base de dados aberta. Nada para fazer.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Incapaz de abrir a base de dados.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Base de dados aberta. Nada para fazer.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Sucesso</translation>
     </message>
@@ -440,40 +766,57 @@ Agora já a pode guardar.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Nome da base de dados:</translation>
+        <source>General</source>
+        <translation>Geral</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Descrição da base de dados:</translation>
+        <source>Encryption</source>
+        <translation>Cifra</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Ciclos de transformação:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Nome de utilizador padrão:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Desempenho</translation>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Número máximo de itens no histórico:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Tamanho máximo para o histórico:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Utilizar reciclagem</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Algoritmo de cifra:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ Agora já a pode guardar.</translation>
         <translation>Twofish:  256 bits</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritmo:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Ciclos de transformação:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Utilização de memória:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Paralelismo:</translation>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation>processo</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Nome da base de dados:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Descrição da base de dados:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Nome de utilizador padrão:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Número máximo de itens no histórico:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Tamanho máximo para o histórico:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Utilizar reciclagem</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Raiz</translation>
     </message>
     <message>
@@ -511,22 +918,48 @@ Agora já a pode guardar.</translation>
         <translation>Ficheiro não encontrado!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Abrir base de dados do KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Incapaz de abrir a base de dados.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Base de dados do KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Ficheiro aberto no modo de leitura.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Abrir ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Ficheiro CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Todos os ficheiros (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Combinar base de dados</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Abrir base de dados do KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Base de dados do KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Fechar?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>%1 está em modo de edição.
+Deseja fechar e perder as alterações?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Guardar alterações?</translation>
     </message>
@@ -541,10 +974,22 @@ Guardar alterações?</translation>
         <translation>Falha ao escrever na base de dados.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Palavras-passe</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Guardar base de dados como</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Exportar base de dados para ficheiro CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Falha ao escrever no ficheiro CSV.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Nova base de dados</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Prima Cancelar para finalizar as alterações ou descarte-as.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Esta base de dados nunca foi guardada.
-Pode guardar a base de dados ou parar de a bloquear.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,70 +1015,14 @@ Otherwise your changes are lost.</source>
 Deseja guardar a base de dados antes de a bloquear ?
 Se não o fizer, perderá as suas alterações.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>%1 está em modo de edição.
-Deseja fechar e perder as alterações?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Exportar base de dados para ficheiro CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Ficheiro CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Falha ao escrever no ficheiro CSV.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Incapaz de abrir a base de dados.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Combinar base de dados</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>A base de dados que está a tentar abrir está bloqueada por outra instância do KeePassXC.
-Ainda assim deseja guardar as alterações?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Palavras-passe</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Base de dados já aberta</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>A base de dados que está a tentar abrir está bloqueada por outra instância do KeePassXC.
-
-Ainda assim deseja abrir a base de dados?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Abrir no modo de leitura</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Ficheiro aberto no modo de leitura.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Abrir ficheiro CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>A procurar...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Alterar chave-mestre</translation>
     </message>
@@ -660,36 +1043,44 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Deseja mesmo apagar permanentemente %1 entradas?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Mover entrada para a reciclagem?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Deseja mesmo mover a entrada &quot;%1&quot; para a reciclagem?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Mover entradas para a reciclagem?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Pretende realmente mover a entrada(s) %n para a reciclagem ?</numerusform><numerusform>Deseja mesmo mover %n entrada(s) para a reciclagem?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Apagar grupo?</translation>
+        <source>Execute command?</source>
+        <translation>Executar comando?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Deseja mesmo apagar permanentemente o grupo &quot;%1&quot;?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Deseja mesmo executar o seguinte comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossível de calcular a chave-mestre</translation>
+        <source>Remember my choice</source>
+        <translation>Memorizar escolha</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Mover entrada para a reciclagem?</translation>
+        <source>Delete group?</source>
+        <translation>Apagar grupo?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Deseja mesmo mover a entrada &quot;%1&quot; para a reciclagem?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Deseja mesmo apagar permanentemente o grupo &quot;%1&quot;?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>A procurar...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Impossível de calcular a chave-mestre</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -708,20 +1099,8 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Sem resultados</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Executar comando?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Deseja mesmo executar o seguinte comando?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Memorizar escolha</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Pedido de recarregamento automático</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -732,8 +1111,9 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Pedido de união</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>O ficheiro da base de dados foi alterado e tem alterações por guardar. Deseja combinar as alterações?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -749,6 +1129,89 @@ Ainda assim deseja abrir a base de dados?</translation>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Fechar</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Expira</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Nome de utilizador</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Escrita automática</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Atributos</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Notas</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Janela</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Sequência</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Pesquisa</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Limpar</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Nunca</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -775,6 +1238,30 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Histórico</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/d</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Histórico da entrada</translation>
     </message>
@@ -795,22 +1282,20 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Novo atributo</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Selecionar ficheiro</translation>
+        <source>Confirm Remove</source>
+        <translation>Confirmação de remoção</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Incapaz de abrir o ficheiro</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Tem a certeza de que deseja remover este atributo?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Guardar anexo</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Incapaz de guardar o anexo:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -818,32 +1303,16 @@ Ainda assim deseja abrir a base de dados?</translation>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n semana(s)</numerusform><numerusform>%n semana(s)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n mês</numerusform><numerusform>%n mês(es)</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 ano</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Confirmação de remoção</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Tem a certeza de que deseja remover este atributo?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[PROTEGIDA] Por favor revele para ver ou editar</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Tem a certeza de que deseja remover este anexo?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -860,18 +1329,6 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Remover</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Anexos</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Guardar</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Editar nome</translation>
     </message>
@@ -883,6 +1340,10 @@ Ainda assim deseja abrir a base de dados?</translation>
         <source>Reveal</source>
         <translation>Revelar</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Anexos</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -891,6 +1352,18 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Ativar escrita automática para esta entrada</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Herdar sequência de escrita automática deste &amp;grupo</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>&amp;Usar sequência personalizada de escrita automática:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Associação de janelas</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -903,14 +1376,6 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Título da janela:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Herdar sequência de escrita automática deste &amp;grupo</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>&amp;Usar sequência personalizada de escrita automática:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Utilizar se&amp;quência padrão</translation>
     </message>
@@ -918,10 +1383,6 @@ Ainda assim deseja abrir a base de dados?</translation>
         <source>Set custo&amp;m sequence:</source>
         <translation>Definir sequê&amp;ncia personalizada:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Associação de janelas</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -945,12 +1406,8 @@ Ainda assim deseja abrir a base de dados?</translation>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Título:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nome de utilizador:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -961,20 +1418,104 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Repetição:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Título:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expira</translation>
+        <source>Notes</source>
+        <translation>Notas</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Predefinições</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notas:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Nome de utilizador:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Expira</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation>segundos</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Impressão digital</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Chave pública</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Comentário</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>n/d</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Copiar para a área de transferência</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Chave privada</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Ficheiro externo</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Procurar...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Anexo</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Adicionar ao agente</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Remover do agente</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1028,7 +1569,7 @@ Ainda assim deseja abrir a base de dados?</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Procurar</translation>
+        <translation>Pesquisa</translation>
     </message>
     <message>
         <source>Auto-Type</source>
@@ -1046,6 +1587,14 @@ Ainda assim deseja abrir a base de dados?</translation>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Utilizar ícone padrão</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Utilizar íco&amp;ne personalizado</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Adicionar ícone personalizado</translation>
     </message>
@@ -1054,6 +1603,18 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Apagar ícone personalizado</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Descarregar &apos;favicon&apos;</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Incapaz de obter o &apos;favicon&apos;.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Dica: pode ativar o Google como recurso em Ferramentas -&gt; Definições -&gt; Segurança</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Imagens</translation>
     </message>
@@ -1066,24 +1627,12 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Selecionar imagem</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Descarregar &apos;favicon&apos;</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Incapaz de obter o &apos;favicon&apos;.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Incapaz de ler o ícone</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Utilizar ícone padrão</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Utilizar íco&amp;ne personalizado</translation>
+        <source>Custom icon already exists</source>
+        <translation>Já existe um ícone personalizado</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1093,14 +1642,6 @@ Ainda assim deseja abrir a base de dados?</translation>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Este ícone está a ser utilizado por %1 entradas e será substituído pelo ícone padrão. Tem a certeza de que deseja apagar o ícone?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Dica: pode ativar o Google como recurso em Ferramentas -&gt; Definições -&gt; Segurança</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Já existe um ícone personalizado</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1125,10 +1666,94 @@ Ainda assim deseja abrir a base de dados?</translation>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Cópia</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Nome</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Tamanho</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Adicionar</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Remover</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Abrir</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Guardar</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Selecionar ficheiros</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Confirmação de remoção</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Guardar anexos</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1157,6 +1782,11 @@ Ainda assim deseja abrir a base de dados?</translation>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Grupo</translation>
     </message>
@@ -1172,11 +1802,6 @@ Ainda assim deseja abrir a base de dados?</translation>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1186,6 +1811,17 @@ Ainda assim deseja abrir a base de dados?</translation>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1248,6 +1884,361 @@ Ainda assim deseja abrir a base de dados?</translation>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossível de calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Incapaz de emitir a pergunta de segurança.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Chave errada ou base de dados danificada.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Incapaz de emitir a pergunta de segurança.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossível de calcular a chave-mestre</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossível de calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Impossível de calcular a chave-mestre</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Não é uma base de dados do KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>O ficheiro selecionado é uma base de dados do KeePass 1 (.kdb).
+
+Pode importá-lo clicando em Base de dados - &gt; &apos;Importar base de dados do KeePass 1...&apos;.
+Esta é uma migração unidirecional. Não será possível abrir a base de dados importada com a versão 0.4 do KeePassX.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1277,140 +2268,181 @@ Ainda assim deseja abrir a base de dados?</translation>
         <translation>Versão da base de dados KeePass não suportada.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Raiz</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Incapaz de calcular a chave-mestre</translation>
+        <translation>Impossível de calcular a chave-mestre</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Chave errada ou base de dados danificada.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Não é uma base de dados do KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Versão da base de dados KeePass não suportada.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Chave errada ou base de dados danificada.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Incapaz de calcular a chave-mestre</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Incapaz de emitir a pergunta de segurança.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>O ficheiro selecionado é uma base de dados do KeePass 1 (.kdb).
-
-Pode importá-lo clicando em Base de dados - &gt; &apos;Importar base de dados do KeePass 1...&apos;.
-Esta é uma migração unidirecional. Não será possível abrir a base de dados importada com a versão 0.4 do KeePassX.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Incapaz de emitir a pergunta de segurança.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Impossível de calcular a chave-mestre</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Erro fatal ao testar as funções de criptografia.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Erro</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Não foi possível criar o ficheiro de bloqueio. Modo de única instância desativado.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Já está em execução uma instância do KeePassXC.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>O ficheiro de bloqueio da instância única é inválido. A iniciar nova instância.</translation>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Abrir base de dados</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Definições da base de dados</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Copiar nome de utilizador para a área de transferência</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Copiar palavra-passe para a área de transferência</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Definições</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Mostrar barra de ferramentas</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>apenas leitura</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Alternar janela</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Base de dados do KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Todos os ficheiros</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Guardar base de dados reparada</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>O ficheiro de bloqueio da instância única é inválido. A iniciar nova instância.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Falha ao escrever na base de dados.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Não foi possível criar o ficheiro de bloqueio. Modo de única instância desativado.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Já está em execução uma instância do KeePassXC.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Erro fatal ao testar as funções de criptografia.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Erro</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>Base &amp;de dados</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>Bases de dados &amp;recentes</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Importar</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Aj&amp;uda</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>E&amp;ntradas</translation>
     </message>
@@ -1419,12 +2451,16 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Copiar at&amp;ributo para a área de transferência</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Grupos</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Ver</translation>
+        <source>&amp;Tools</source>
+        <translation>Ferramen&amp;tas</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1435,6 +2471,10 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>&amp;Acerca</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>Abrir base de dad&amp;os...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Guardar base de dado&amp;s</translation>
     </message>
@@ -1475,24 +2515,24 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Apagar g&amp;rupo</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Definições da base de dados</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>G&amp;uardar base de dados como...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Clonar entrada</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Alterar chave-&amp;mestre...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Palavra-passe &apos;timed one-time&apos;</translation>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Definições da base de dados</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Copiar &amp;TOTP</translation>
+        <source>Database settings</source>
+        <translation>Definições da base de dados</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Mostrar TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Clonar entrada</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1503,14 +2543,26 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>Copiar nome de &amp;utilizador</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Copiar nome de utilizador para a área de transferência</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Cop&amp;iar palavra-passe</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Copiar palavra-passe para a área de transferência</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>Definiçõe&amp;s</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Gerador de palavra-passe</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>E&amp;xecutar escrita automática</translation>
     </message>
@@ -1527,165 +2579,210 @@ Esta é uma migração unidirecional. Não será possível abrir a base de dados
         <translation>&amp;Título</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation>Copiar título para a área de transferência</translation>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Copiar URL para a área de transferência</translation>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notas</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Gerador de palavras-passe</translation>
+        <source>Copy notes to clipboard</source>
+        <translation>Copiar notas para a área de transferência</translation>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Limpar histórico</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Exportar para ficheiro CSV...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>Base &amp;de dados</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Importar base de dados do KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Importar</translation>
+        <source>Import CSV file...</source>
+        <translation>Importar ficheiro CSV...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>Ferramen&amp;tas</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Re&amp;parar base de dados...</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Limpar reciclagem</translation>
+        <source>Show TOTP</source>
+        <translation>Mostrar TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Configurar TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Copiar &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation>Limpar reciclage&amp;m</translation>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Limpar histórico</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Erro de acesso ao ficheiro %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Sair do KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Toque no botão da sua YubiKey!</translation>
+        <source>read-only</source>
+        <translation>apenas leitura</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Aj&amp;uda</translation>
+        <source>Settings</source>
+        <translation>Definições</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>Abrir base de dad&amp;os...</translation>
+        <source>Toggle window</source>
+        <translation>Alternar janela</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>G&amp;uardar base de dados como...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Sair do KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Alterar chave-&amp;mestre...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Base de dados do KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Exportar para ficheiro CSV...</translation>
+        <source>All files</source>
+        <translation>Todos os ficheiros</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Importar base de dados do KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Abrir base de dados</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Importar ficheiro CSV...</translation>
+        <source>Save repaired database</source>
+        <translation>Guardar base de dados reparada</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Re&amp;parar base de dados...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Falha ao escrever na base de dados.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Configurar TOTP...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Toque no botão da sua YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Geral</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>M&amp;ostrar notificação se as credenciais forem solicitadas</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Ordenar entradas coincidentes por nome de &amp;utilizador</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Re&amp;mover todas as permissões guardadas para as entradas da base de dados ativa</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Permitir sempre &amp;acesso às entradas</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Permitir sempre at&amp;ualizar as entradas</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Procurar em todas as base de dados abertas por entradas semel&amp;hantes</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Porta HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Porta padrão: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </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 esta estiver bloqueada</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Ordenar &amp;entradas por título</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>O KeePassXC vai escutar nesta porta em 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Incapaz de associar às portas privilegiadas </translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Não é possível associar a portas privilegiadas inferiores à 1024!
-Será utilizada a porta 19455 (padrão).</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>R&amp;emover todas as chaves cifradas partilhadas da base de dados ativa</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Most&amp;rar campos avançados que começam com &quot;KPH: &quot;</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>A criação ou atualização dos campos de cadeias não é suportada.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diálogo</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1696,6 +2793,15 @@ Será utilizada a porta 19455 (padrão).</translation>
         <translation>Ativar servidor KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Geral</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>M&amp;ostrar notificação se as credenciais forem solicitadas</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Apenas devolve as melhores entradas para o URL específico em vez das entradas para o domínio.</translation>
     </message>
@@ -1704,6 +2810,10 @@ Será utilizada a porta 19455 (padrão).</translation>
         <translation>Devolve&amp;r apenas as entradas coincidentes</translation>
     </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 esta estiver bloqueada</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Apenas serão devolvidas as entradas com o mesmo esquema (http://, https://, ftp://, ...).</translation>
     </message>
@@ -1712,27 +2822,108 @@ Será utilizada a porta 19455 (padrão).</translation>
         <translation>Corresponder com os esque&amp;mas do URL</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Ordenar entradas coincidentes por nome de &amp;utilizador</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Ordenar &amp;entradas por título</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>R&amp;emover todas as chaves de cifra partilhadas da base de dados ativa</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Re&amp;mover todas as permissões guardadas para as entradas da base de dados ativa</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Gerador de palavra-passe</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Avançado</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Permitir sempre &amp;acesso às entradas</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Permitir sempre at&amp;ualizar as entradas</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Apenas a base de dados selecionada tem que estar conectada a um cliente.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>As opções seguintes podem ser perigosas!
-Apenas as deve alterar se souber o que está a fazer.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Procurar em todas as base de dados abertas por entradas semel&amp;hantes</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>A criação ou atualização dos campos de cadeias não é suportada.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Most&amp;rar campos avançados que começam com &quot;KPH: &quot;</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Porta HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Porta padrão: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>O KeePassXC vai escutar nesta porta em 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Incapaz de associar às portas privilegiadas </translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Não é possível associar a portas privilegiadas inferiores à 1024!
+Será utilizada a porta 19455 (padrão).</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Palavra-passe:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>qualidade</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropia</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Palavra-passe</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Tipos de caracteres</translation>
     </message>
@@ -1750,41 +2941,53 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation>Caracteres  especiais</translation>
+        <translation>Caracteres especiais</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>ASCII expandido</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
         <translation>Excluir caracteres semelhantes</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Aceitar</translation>
+        <source>Pick characters from every group</source>
+        <translation>Obter caracteres de todos os grupos</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Comprimento:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>qualidade</translation>
+        <source>Passphrase</source>
+        <translation>Frase-chave</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropia</translation>
+        <source>Wordlist:</source>
+        <translation>Lista de palavras:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Comprimento:</translation>
+        <source>Word Count:</source>
+        <translation>Número de palavras:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Obter caracteres de todos os grupos</translation>
+        <source>Word Separator:</source>
+        <translation>Separador de palavras:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Gerar</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Copiar</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Aceitar</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Fechar</translation>
     </message>
@@ -1802,51 +3005,270 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Má</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Fraca</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Boa</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Excelente</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Palavra-passe</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>ASCII expandido</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Frase-chave</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Lista de palavras:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Número de palavras:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Separador de palavras:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Caminho da base de dados.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Extrair e mostrar o conteúdo da base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Caminho da base de dados a extrair.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Nome do comando a executar.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Listar entradas da base de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Caminho do grupo a listar. Padrão é /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Combinar duas bases de dados.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Caminho da base de dados de destino da combinação.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Caminho da base de dados de origem da combinação.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Nome da entrada a mostrar.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Dispositivo NULL</translation>
@@ -1870,8 +3292,28 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
         <translation>carácter de fecho em falta</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>INTERNO - limite inferior &apos;unget&apos; excedido</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1890,14 +3332,22 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
         <translation>Palavra-passe</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notas</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Integração com navegador</translation>
     </message>
@@ -1913,6 +3363,10 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
         <source>Passive</source>
         <translation>Passiva</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1951,8 +3405,8 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Maiúsculas/minúsculas</translation>
+        <source>Search...</source>
+        <translation>Pesquisa...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1963,8 +3417,8 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
         <translation>Limpar</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Pesquisa...</translation>
+        <source>Case Sensitive</source>
+        <translation>Maiúsculas/minúsculas</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1974,50 +3428,6 @@ Apenas as deve alterar se souber o que está a fazer.</translation>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Já existe uma chave de cifra partilhada com o nome &quot;%1&quot;.
-Deseja substituir a chave de cifra?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Deseja atualizar as informações em %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>A base de dados ativa está bloqueada!
-Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Removidas com sucesso %1 de cifra - %2 das definições do KeePassXHttp.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Nenhuma chaves de cifra partilhadas encontrada nas definições do KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>A base de dados ativa não contém uma entrada de definições KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>A remover permissões guardadas...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Abortar</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Removidas com sucesso as permissões de %1 %2.</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>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Pedido de associação de nova chave</translation>
     </message>
@@ -2034,33 +3444,77 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
         <translation>KeePassXC: Substituir chave existente?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Já existe uma chave de cifra partilhada com o nome &quot;%1&quot;.
+Deseja substituir a chave atual?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Atualizar entrada</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Deseja atualizar as informações em %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: Base de dados bloqueada!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>A base de dados ativa está bloqueada!
+Desbloqueie a base de dados selecionada ou escolha outra que esteja desbloqueada.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Remover chaves da base de dados</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Nenhuma chave encontrada</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Não existem chaves de cifra partilhadas nas definições do KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Definições indisponíveis!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>A base de dados ativa não contém uma entrada de definições KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>A remover permissões guardadas...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Abortar</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Permissões removidas</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Não existem entradas com permissões!</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>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2084,10 +3538,26 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Definições básicas</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Abrir apenas uma instância do KeepassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Memorizar últimas bases de dados</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Memorizar últimos ficheiros-chave e dispositivos de segurança</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Ao iniciar, carregar a última base de dados utilizada</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Guardar automaticamente ao fechar</translation>
     </message>
@@ -2096,20 +3566,28 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
         <translation>Guardar automaticamente a cada alteração</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Recarregar base de dados se esta for modificada externamente</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Minimizar ao copiar para a área de transferência</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Minimizar janela ao iniciar a aplicação</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Utilizar ícone do grupo ao criar a entrada</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Atalho global de escrita automática</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Não marcar base de dados como alterada para modificações não efetuadas em dados (ex.: expansão de grupos)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Idioma</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,75 +3598,73 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
         <translation>Ao minimizar, ocultar a janela na bandeja do sistema</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Ao iniciar, carregar a última base de dados utilizada</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Recarregar base de dados se esta for modificada externamente</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Ao fechar, ocultar a janela na bandeja do sistema</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Minimizar janela ao iniciar a aplicação</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Definições básicas</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Memorizar últimos ficheiros-chave e dispositivos de segurança</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Não marcar base de dados como alterada para modificações não efetuadas em dados (ex.: expansão de grupos)</translation>
+        <source>Language</source>
+        <translation>Idioma</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Escrita automática</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Utilizar título da entrada e URL para correspondência entre as janelas e a escrita automática</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Utilizar título da entrada para fazer coincidir com a escrita automática</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Utilizar URL da entrada para fazer coincidir com a escrita automática</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Perguntar antes de executar a escrita automática</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Atalho global de escrita automática</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Atraso de escrita automática</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> ms</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Abrir apenas uma instância do KeepassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Tempo limite</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Limpar área de transferência após</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation> seg</translation>
+        <comment>Seconds</comment>
+        <translation> seg.</translation>
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
         <translation>Bloquear base de dados se inativa durante</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Mostrar palavras-passe em texto simples</translation>
+        <source>Convenience</source>
+        <translation>Conveniência</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Bloquear base de dados ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2199,16 +3675,16 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
         <translation>Não pedir repetição da palavra-passe se esta estiver visível</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Tempo limite</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Mostrar palavras-passe em texto simples</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Conveniência</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Bloquear base de dados ao bloquear a sessão ou ao fechar a tampa do portátil</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2230,6 +3706,14 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
         <translation>Chave:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Usar definições personalizadas</translation>
     </message>
@@ -2255,6 +3739,7 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> seg.</translation>
     </message>
 </context>
@@ -2322,88 +3807,40 @@ KeePassXC, atribua um nome único para a identificar e aceitar.</translation>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>caminho para um ficheiro de configuração personalizado</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>ficheiro-chave da base de dados</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - Gestor de palavras-passe multi-plataforma</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>ler palavra-passe da base de dados a partir de stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>nome de ficheiro das bases de dados a abrir (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Copiar palavra-passe para a área de transferência</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Caminho da base de dados.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Usar um GUI para desbloquear a base de dados.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Nome da entrada a copiar.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Extrair e mostrar o conteúdo da base de dados.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Caminho da base de dados a extrair.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Nome do comando a executar.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Listar entradas da base de dados.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Caminho do grupo a listar. Padrão é /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Mostrar os UUID das entradas e dos grupos.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Combinar duas bases de dados.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - Gestor de palavras-passe multi-plataforma</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Caminho da base de dados de destino da combinação.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>nome de ficheiro das bases de dados a abrir (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Caminho da base de dados de origem da combinação.</translation>
+        <source>path to a custom config file</source>
+        <translation>caminho para um ficheiro de configuração personalizado</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Utilizar a mesma palavra-passe para ambas as bases de dados.</translation>
+        <source>key file of the database</source>
+        <translation>ficheiro-chave da base de dados</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Mostrar palavra-passe.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>ler palavra-passe da base de dados a partir de stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Nome da entrada a mostrar.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_ru.ts b/share/translations/keepassx_ru.ts
index 3058bcf14..6fbe2c430 100644
--- a/share/translations/keepassx_ru.ts
+++ b/share/translations/keepassx_ru.ts
@@ -10,14 +10,34 @@
         <translation>О программе</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Сообщать об ошибках: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Проект сопровождают:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Участники</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Посмотреть вклад на GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Отладочная информация</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Включите следующую информацию, когда сообщаете об ошибке:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Скопировать в буфер обмена</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Ревизия: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Дистрибутив: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Библиотеки:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</source>
         <source>Enabled extensions:</source>
         <translation>Включенные расширения:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Сообщать об ошибках: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC распространяется на условиях Стандартной общественной лицензии GNU (GPL) версии 2 или (на ваше усмотрение) версии 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Сопровождающие проекта:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Посмотреть вклад на GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Включите следующую информацию, когда сообщаете об ошибке:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>Дистрибутив: %1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Подтверждение доступа к KeePassXC HTTP</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Запомнить это решение</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 запросил доступ к паролям для следующего элемента(ов).
 Разрешить доступ?</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Подтверждение доступа к KeePassXC HTTP</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation>Включить агент SSH (требуется перезапуск)</translation>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>Автоввод - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Автоввод</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation>Неверная инструкции автоввода!</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation>Слишком большая задержка в инструкции автоввода. Вы действительно хотите продолжить?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation>Инструкция автоввода содержит очень медленные нажатия клавиш. Вы действительно хотите продолжить?</translation>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation>Эта команда автоввода содержит часто повторяющиеся аргументы. Вы действительно хотите продолжить?</translation>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,293 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Автоввод - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Выберите запись для автоввода:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Автоввод - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation>Подтверждение доступа для KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Запомнить это решение</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Разрешить</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Запретить</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 запросил доступ к паролям для следующего элемента(ов).
+Разрешить доступ?</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Диалог</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation>Это требуется для доступа к вашей базы данных с KeePassXC-Browser</translation>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation>Включить интеграцию с браузером</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation>Включить интеграцию для браузеров:</translation>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Показывать &amp;уведомление при запросе учётных данных</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Запрашивать разблокировку базы данных, если она заблокирована</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation>Возвращаются только записи с той же схемой (http://, https://,...).</translation>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation>&amp;Совпадение схем URL-адресов (например: https://...)</translation>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Возвращает только лучшие совпадения для определенного URL-адреса вместо всех записей для всего домена.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation>&amp;Возвращать только наиболее подходящие совпадения</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Сортировать &amp;подходящие учетные данные по названию</translation>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Сортировать по &amp;имени пользователя</translation>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation>&amp;Отключить все браузеры</translation>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation>Забыть все &amp;разрешения</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Продвинутые</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Не &amp;запрашивать доступ к записям</translation>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Никогда не спрашивать перед &amp;обновлением учетных данных</translation>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>К клиенту должна быть подключена только выбранная база данных.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Автоматическое создание или обновление полей, содержащих строки, не поддерживается.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Возвращать продвинутые стро&amp;ковые поля, начинающиеся с «KPH: »</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation>Поддержка прокси приложения между KeePassXC и расширением браузера.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation>Использование &amp;прокси приложения между KeePassXC и расширением браузера</translation>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation>Использовать пользовательский путь к прокси, если вы установили прокси вручную.</translation>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation>Использовать &amp;пользовательское местоположение прокси</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Обзор...</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Предупреждение:&lt;/b&gt; Следующие параметры могут быть опасны!</translation>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation>Исполняемые файлы (*.exe);;Все файлы (*.*)</translation>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation>Исполняемые файлы (*)</translation>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation>Выбрать другое расположение прокси</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Запрос на ассоциацию нового ключа</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation>Получен запрос на ассоциацию вышеуказанного ключа.
+
+Если хотите разрешить доступ к базе данных KeePassXC,
+дайте ему уникальное имя, чтобы распознать и принять ключ.</translation>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation>Сохранить и разрешить доступ</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Перезаписать существующий ключ?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Разделяемый секретный ключ с именем &quot;%1&quot; уже существует.
+Вы действительно хотите перезаписать его?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Обновить запись</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Обновить информацию в %1 - %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: База данных заблокирована!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Активная база данных заблокирована!
+Разблокируйте выбранную базу данных или выберите другую, незаблокированную.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Настройки недоступны!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation>В базе данных отсутствует запись с настройками.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Ключи не найдены</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation>Разделяемые секретные ключи не найдены в настройках KeePassXC.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Ключи удалены из базы данных</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation><numerusform>Успешно удалена %n ключ(и) шифрования от KeePassXC параметров.</numerusform><numerusform>Успешно удалена %n ключ(и) шифрования от KeePassXC параметров.</numerusform><numerusform>Успешно удалена %n ключ(и) шифрования от KeePassXC параметров.</numerusform><numerusform>Успешно удалено %n ключей шифрования из параметров KeePassXC.</numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation>Удаление сохраненных разрешений...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Прервать</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Права доступа удалены</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation><numerusform>Успешно удалены разрешения от %n entry(s).</numerusform><numerusform>Успешно удалены разрешения от %n entry(s).</numerusform><numerusform>Успешно удалены разрешения от %n entry(s).</numerusform><numerusform>Успешно удалены доступы для %n записей.</numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: Не найдена запись с правами доступа!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Активная база данных не содержит записей с назначенными правами доступа.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +457,10 @@ Please select whether you want to allow access.</source>
         <translation>Повторите пароль:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Файл-&amp;ключ</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
@@ -157,6 +469,14 @@ Please select whether you want to allow access.</source>
         <translation>Создать</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Запрос ответа</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Обновить</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Файлы-ключи</translation>
     </message>
@@ -166,15 +486,19 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Create Key File...</source>
-        <translation>Создать файл-ключ...</translation>
+        <translation>Создать ключ-файл...</translation>
     </message>
     <message>
         <source>Unable to create Key File : </source>
-        <translation>Невозможно создать файл-ключ:</translation>
+        <translation>Невозможно создать ключ-файл:</translation>
     </message>
     <message>
         <source>Select a key file</source>
-        <translation>Выбрать файл-ключ</translation>
+        <translation>Выбрать ключ-файл</translation>
+    </message>
+    <message>
+        <source>Empty password</source>
+        <translation>Пустой пароль</translation>
     </message>
     <message>
         <source>Do you really want to use an empty string as password?</source>
@@ -187,24 +511,21 @@ Please select whether you want to allow access.</source>
     <message>
         <source>Failed to set %1 as the Key file:
 %2</source>
-        <translation>Не удалось установить %1 как файл-ключ:
+        <translation>Не удалось установить %1 как ключ-файл:
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Файл-&amp;ключ</translation>
+        <source>Legacy key file format</source>
+        <translation>Формат файла устаревшего ключа</translation>
     </message>
     <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Запрос ответа</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Обновить</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Пустой пароль</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>Вы используете устаревший формат файл ключа, поддержка которого может быть прекращена в будущем.
+
+Рассмотрите возможность создания нового файла ключа.</translation>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +539,10 @@ Please select whether you want to allow access.</source>
         <translation>Параметры клонирования</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Добавить к названию « - клон»</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Использовать ссылки для имени пользователя и пароля</translation>
     </message>
@@ -225,10 +550,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>История копирования</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Добавить к названию « - клон»</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +647,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Импорт CSV-файла</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -340,17 +657,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> байт, </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation><numerusform>%n байт(а), </numerusform><numerusform>%n байт(а), </numerusform><numerusform>%n байт(а), </numerusform><numerusform>%n байт(а), </numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> строк, </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation><numerusform>%n строк, </numerusform><numerusform>%n строк, </numerusform><numerusform>%n строк, </numerusform><numerusform>%n строк, </numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> столбцов</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform><numerusform>%n столбцов</numerusform></translation>
     </message>
 </context>
 <context>
@@ -361,7 +678,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Key File:</source>
-        <translation>Файл-ключ:</translation>
+        <translation>Ключ-файл:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -372,12 +689,37 @@ Please select whether you want to allow access.</source>
         <translation>Обзор</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Обновить</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Запрос ответа:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Невозможно открыть базу данных.</translation>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Не могу открыть файл-ключ</translation>
+        <translation>Не могу открыть ключ-файл</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation>Формат файла устаревшего ключа</translation>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation>Вы используете устаревший формат файл ключа, поддержка которого может быть прекращена в будущем.
+
+Рассмотрите возможность создания нового файла ключа.</translation>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation>Не показывать это предупреждение</translation>
     </message>
     <message>
         <source>All files</source>
@@ -389,15 +731,7 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Select key file</source>
-        <translation>Выберите файл-ключ</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Обновить</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Запрос ответа:</translation>
+        <translation>Выберите ключ-файл</translation>
     </message>
 </context>
 <context>
@@ -412,17 +746,17 @@ Please select whether you want to allow access.</source>
     </message>
     <message>
         <source>Can&apos;t open key file</source>
-        <translation>Не могу открыть файл-ключ</translation>
-    </message>
-    <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>База данных открылось прекрасно. Больше нечего делать.</translation>
+        <translation>Не могу открыть ключ-файл</translation>
     </message>
     <message>
         <source>Unable to open the database.</source>
         <translation>Невозможно открыть базу данных.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>База данных открылось прекрасно. Больше нечего делать.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Успешно</translation>
     </message>
@@ -440,40 +774,61 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Название базы данных:</translation>
+        <source>General</source>
+        <translation>Общие</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Описание базы данных:</translation>
+        <source>Encryption</source>
+        <translation>Шифрование</translation>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Раундов преобразований:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Слишком много раундов</translation>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Имя пользователя по умолчанию:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation>Вы используете очень большое количество раундов преобразования ключа с Argon2.
+
+Если вы сохранить это значение, открытие базы данных может занять часы или дни (или даже больше)!</translation>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>МиБ</translation>
+        <source>Understood, keep number</source>
+        <translation>Понятно, сохраните номер</translation>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Проверка</translation>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Максимум записей истории:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation>Слишком мало раундов</translation>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Максимальный размер истории:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation>Вы используете очень мало раундов ключевых преобразований с AES-KDF.
+
+Если вы сохраните это значение, база данных может быть взломана слишком легко!</translation>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Использовать корзину</translation>
+        <source>KDF unchanged</source>
+        <translation>ФФК не изменена</translation>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation>Ошибка преобразования ФФК с новыми параметрами; ФФК не изменена.</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation>Алгоритм шифрования:</translation>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +839,78 @@ You can now save it.</source>
         <translation>Twofish:  256 бит</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Алгоритм:</translation>
+        <source>Key Derivation Function:</source>
+        <translation>Функция формирования ключа:</translation>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Раундов преобразований:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation>Тест 1-секундной задержки</translation>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation>Использование памяти:</translation>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation> МБ</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation>Параллелизм:</translation>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation> поток</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation>Метаданные базы данных</translation>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Название базы данных:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Описание базы данных:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Имя пользователя по умолчанию:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation>Настройки истории</translation>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Максимум записей истории:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Максимальный размер истории:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>МиБ</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Использовать корзину</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Корень</translation>
     </message>
     <message>
@@ -511,22 +930,48 @@ You can now save it.</source>
         <translation>Файл не найден!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Открыть базу данных KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Невозможно открыть базу данных.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>База данных KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Файл открыт в режиме только для чтения.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Открыть файл CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Файл CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Все файлы (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Объединить базу данных</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Открыть базу данных KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>База данных KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Закрыть?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>«%1» в режиме правки.
+Отменить изменения и всё равно закрыть?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Сохранить изменения?</translation>
     </message>
@@ -541,10 +986,22 @@ Save changes?</source>
         <translation>Не удалось записать базу данных.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Пароли</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Сохранить базу данных как</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Экспортировать базу данных в файл CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Не удалось записать CSV файл.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Новая база данных</translation>
     </message>
@@ -563,12 +1020,6 @@ Please press cancel to finish your changes or discard them.</source>
 Нажмите Отмена, чтобы завершить изменения или отклонить их.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Эта база данных никогда не была сохранена.
-Можно сохранить базу данных или остановить её заблокированной.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,72 +1027,16 @@ Otherwise your changes are lost.</source>
 Сохранить её перед тем, как заблокировать?
 В противном случае все изменения будут потеряны.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>«%1» в режиме правки.
-Отменить изменения и всё равно закрыть?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Экспортировать базу данных в файл CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Файл CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Не удалось записать CSV файл.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Не удаётся открыть базу данных.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Объединить базу данных</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>База данных, в которую пытаетесь сохранить, заблокирована другим экземпляром KeePassXC.
-Сохранить в любом случае?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Пароли</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>База данных уже открыта</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>База данных, которую пытаетесь открыть, заблокирована другим экземпляром KeePassXC.
-
-Открыть в любом случае?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Открыть в режиме «только чтение»</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Файл открыт в режиме только для чтения.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Открыть файл CSV</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Поиск...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
-        <translation>Изменить мастер-пароль</translation>
+        <translation>Сменить мастер-пароль</translation>
     </message>
     <message>
         <source>Delete entry?</source>
@@ -660,36 +1055,44 @@ Do you want to open it anyway?</source>
         <translation>Удалить навсегда %1 записей?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Переместить запись в корзину?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Переместить запись «%1» в корзину?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Поместить записи в корзину?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Вы действительно хотите поместить %n запись в корзину?</numerusform><numerusform>Вы действительно хотите поместить %n записи в корзину?</numerusform><numerusform>Вы действительно хотите поместить %n записей в корзину?</numerusform><numerusform>Вы действительно хотите поместить %n записей в корзину?</numerusform></translation>
+        <translation><numerusform>Вы действительно хотите переместить %n entry(s) в корзину?</numerusform><numerusform>Вы действительно хотите переместить %n entry(s) в корзину?</numerusform><numerusform>Вы действительно хотите переместить %n entry(s) в корзину?</numerusform><numerusform>Вы действительно хотите переместить %n записей в корзину?</numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Удалить группу?</translation>
+        <source>Execute command?</source>
+        <translation>Выполнить команду?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Удалить навсегда группу «%1»?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Выполнить следующую команду?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Невозможно вычислить мастер-пароль</translation>
+        <source>Remember my choice</source>
+        <translation>Запомнить мой выбор</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Переместить запись в корзину?</translation>
+        <source>Delete group?</source>
+        <translation>Удалить группу?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Переместить запись «%1» в корзину?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Удалить навсегда группу «%1»?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Поиск...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Невозможно вычислить мастер-пароль</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -708,20 +1111,8 @@ Do you want to open it anyway?</source>
         <translation>Нет результатов</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Выполнить команду?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Выполнить следующую команду?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Запомнить мой выбор</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Запрос на автозагрузку</translation>
+        <source>File has changed</source>
+        <translation>Файл был изменен</translation>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -732,8 +1123,10 @@ Do you want to open it anyway?</source>
         <translation>Запрос на слияние</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Файл базы данных изменился, а также присутствуют несохранённые изменения. Объединить изменения?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation>База данных была изменена, а также присутствуют несохраненные изменения.
+Вы хотите объединить изменения?</translation>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -749,6 +1142,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation>Генерировать TOTP токен</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL-адрес</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation>Срок действия</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Имя пользователя</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation>Автоввод</translation>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation>Поиск</translation>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation>Атрибуты</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Вложения</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Примечания</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Окно</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Последовательность</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Поиск</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Очистить</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation>Никогда</translation>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation>[Защищённый]</translation>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation>Отключено</translation>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation>Включено</translation>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -756,7 +1232,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Advanced</source>
-        <translation>Расширенные</translation>
+        <translation>Продвинутые</translation>
     </message>
     <message>
         <source>Icon</source>
@@ -775,6 +1251,30 @@ Do you want to open it anyway?</source>
         <translation>История</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation>SSH Агент</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>н/д</translation>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation> (зашифровано)</translation>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation>Выберите личный ключ</translation>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation>Файл слишком большой, чтобы быть личным ключом</translation>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation>Не удалось открыть личный ключ</translation>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>История записи</translation>
     </message>
@@ -795,22 +1295,20 @@ Do you want to open it anyway?</source>
         <translation>Новый атрибут</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Выбрать файл</translation>
+        <source>Confirm Remove</source>
+        <translation>Подтверждение удаления</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Невозможно открыть файл</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Удалить этот атрибут?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Сохранить вложение</translation>
+        <source>[PROTECTED]</source>
+        <translation>[ЗАЩИЩЕННЫЙ]</translation>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Невозможно сохранить вложение:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation>Нажмите Показать для просмотра или редактирования</translation>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -818,32 +1316,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n неделя</numerusform><numerusform>%n недели</numerusform><numerusform>%n недель</numerusform><numerusform>%n недель</numerusform></translation>
+        <translation><numerusform>%n нед</numerusform><numerusform>%n нед</numerusform><numerusform>%n нед</numerusform><numerusform>%n недель</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n месяц</numerusform><numerusform>%n месяца</numerusform><numerusform>%n месяцев</numerusform><numerusform>%n месяцев</numerusform></translation>
+        <translation><numerusform>%n месяц(-а)(-ев)</numerusform><numerusform>%n месяц(-а)(-ев)</numerusform><numerusform>%n месяц(-а)(-ев)</numerusform><numerusform>%n месяцев</numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 год</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Подтверждение удаления</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Удалить этот атрибут?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[Защищён] Нажмите для открытия просмотра или правки</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Удалить это вложение?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -860,18 +1342,6 @@ Do you want to open it anyway?</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Вложения</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Сохранить</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Открыть</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Изменить имя</translation>
     </message>
@@ -883,6 +1353,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>Открытие</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Вложения</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -891,6 +1365,18 @@ Do you want to open it anyway?</source>
         <translation>Включить автоввод для этой записи</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Унаследовать стандартную последовательность автоввода от &amp;группы</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Использовать сво&amp;ю последовательность автоввода:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Ассоциации окон</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -903,14 +1389,6 @@ Do you want to open it anyway?</source>
         <translation>Заголовок окна:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Унаследовать стандартную последовательность автоввода от &amp;группы</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Использовать сво&amp;ю последовательность автоввода:</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Использовать стан&amp;дартную последовательность</translation>
     </message>
@@ -918,10 +1396,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>Установить сво&amp;ю последовательность:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Ассоциации окон</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -945,12 +1419,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Название:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Имя пользователя:</translation>
+        <source>URL:</source>
+        <translation>URL-адрес:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -961,20 +1431,104 @@ Do you want to open it anyway?</source>
         <translation>Пароль ещё раз:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>Адрес:</translation>
+        <source>Title:</source>
+        <translation>Название:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Истекает</translation>
+        <source>Notes</source>
+        <translation>Примечания</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Предустановки</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Примечания:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation>Установите для отображения раздела примечаний.</translation>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Имя пользователя:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Истекает</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation>Убрать ключ из агента после</translation>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation> секунд</translation>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation>Отпечаток</translation>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation>Убрать ключ из агента при закрытии/блокировании базы данных</translation>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation>Открытый ключ</translation>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation>Добавить ключ в агент, после открытия/разблокировки базы данных</translation>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation>Комментарий</translation>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation>Расшифровать</translation>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation>н/д</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Скопировать в буфер обмена</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation>Личный ключ</translation>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation>Внешний файл</translation>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation>Просмотр...</translation>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation>Вложение</translation>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation>Добавить в агент</translation>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation>Убрать из агента</translation>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation>Требовать подтверждения пользователя, когда этот ключ используется</translation>
     </message>
 </context>
 <context>
@@ -1046,6 +1600,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>Использовать с&amp;тандартный значок</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Использовать св&amp;ой значок</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Добавить свой значок</translation>
     </message>
@@ -1054,6 +1616,18 @@ Do you want to open it anyway?</source>
         <translation>Удалить свой значок</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Скачать значок сайта</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Не удалось получить значок.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Подсказка: в качестве резервного варианта для получения значков сайтов возможно использовать  Google. Включите этот параметр в меню «Инструменты» -&gt; «Настройки» -&gt; «Безопасность»</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Изображения</translation>
     </message>
@@ -1066,24 +1640,12 @@ Do you want to open it anyway?</source>
         <translation>Выбор изображения</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Скачать значок сайта</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Не удалось получить значок.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Не могу прочитать значок</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>Использовать с&amp;тандартный значок</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Использовать св&amp;ой значок</translation>
+        <source>Custom icon already exists</source>
+        <translation>Пользовательский значок уже существует</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1093,14 +1655,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Этот значок использует %1 записей и будет заменен значком по умолчанию. Хотите удалить его?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Подсказка: в качестве резервного варианта для получения значков сайтов возможно использовать  Google. Включите этот параметр в меню «Инструменты» -&gt; «Настройки» -&gt; «Безопасность»</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>Пользовательский значок уже существует</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1125,10 +1679,98 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - клон</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Имя</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation>Размер</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Создать</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Открыть</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Сохранить</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation>Выберите файлы</translation>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложения?</numerusform><numerusform>Вы уверены, что вы хотите удалить %n вложений?</numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Подтверждение удаления</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation>Сохранить вложения</translation>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation>Не удается создать каталог: %1</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation>Вы уверены, что вы хотите, перезаписать существующий файл &quot;%1&quot; с вложением?</translation>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation>Подтвердить перезапись</translation>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation>Не удается сохранить вложение:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation>Не удается открыть вложение:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation>Не удается открыть вложение:
+%1</translation>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation>Не удается открыть файлы:
+%1</translation>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1151,12 +1793,17 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>URL</source>
-        <translation>Адрес</translation>
+        <translation>URL-адрес</translation>
     </message>
 </context>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ссылка: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Группа</translation>
     </message>
@@ -1170,12 +1817,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>URL</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ссылка: </translation>
+        <translation>URL-адрес</translation>
     </message>
 </context>
 <context>
@@ -1186,6 +1828,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation>KeePassXC: Не удается сохранить файл!</translation>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation>Не удается сохранить файл сценария для механизма native messaging.</translation>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1248,6 +1901,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Невозможно вычислить мастер-пароль</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Не удалось выполнить запрос ответа.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Неверный ключ или файл базы данных повреждён.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Не удалось выполнить запрос ответа.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Невозможно вычислить мастер-пароль</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation>отсутствуют заголовки базы данных</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Невозможно вычислить мастер-пароль</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation>Неправильный размер контрольной суммы заголовка</translation>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation>Несоответствие SHA256 заголовка</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation>Неправильный ключ или файл базы данных поврежден. (несоответствие HMAC)</translation>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation>Неизвестные шифр</translation>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation>Неправильная длинна заголовка</translation>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation>Не удалось открыть буфер для ФФК параметров в заголовке</translation>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation>Функция формирования ключа (ФФК) не поддерживается или неверные параметры</translation>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation>Устаревшие поля заголовков найденные в файле KDBX4.</translation>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation>Недопустимый внутренний идентификатор заголовка</translation>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation>Неподдерживаемая версия структуры метаданных KeePass.</translation>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Невозможно вычислить мастер-пароль</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation>Недопустимая длина uuid шифра</translation>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation>Неподдерживаемые шифр</translation>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation>Недопустимая длина флагов сжатия</translation>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation>Неподдерживаемый алгоритм сжатия</translation>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation>Недопустимый начальный размер байт</translation>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation>Недопустимый размер индентификатора случайного потока</translation>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Не база данных KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Выбранный файл от старой KeePass 1 базы данных (.kdb).
+
+Вы можете импортировать его, нажав на База Данных &gt; «Импорт KeePass 1 базы данных...».
+Это одностороннее перемещение. Вы не сможете открыть импортированную базу данных на старой версии KeePassX 0,4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation>Ошибка разбора XML: %1</translation>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation>Нет root группы</translation>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation>Нет значка uuid или данных</translation>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation>Отсутствует ключ пользовательских данных или значение</translation>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation>Несколько элементов группы</translation>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation>Значение uuid для NULL группы</translation>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation>Недопустимое значение EnableAutoType</translation>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation>Отсутствует групповой uuid</translation>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation>Null DeleteObject uuid</translation>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation>Null uuid для записи</translation>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation>Элемент истории в истории записи</translation>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation>Нет uuid для записи</translation>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation>Элемент истории с отличающимся uuid</translation>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation>Не удается расшифровать строку записи</translation>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation>Найден повторяющиеся пользовательский атрибут</translation>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation>Отсутствует окно или последовательность для автоввода</translation>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation>Недопустимое логическое значение</translation>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation>Недопустимое значение даты времени </translation>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation>Недопустимое значение цвета</translation>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation>Недопустимое значение части цвета rgb</translation>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation>Недопустимое значение uuid</translation>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation>Не удается распаковать двоичные данные</translation>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1262,7 +2270,7 @@ Do you want to open it anyway?</source>
     <name>KeePass1Reader</name>
     <message>
         <source>Unable to read keyfile.</source>
-        <translation>Невозможно прочесть файл-ключ.</translation>
+        <translation>Невозможно прочесть ключ-файл.</translation>
     </message>
     <message>
         <source>Not a KeePass database.</source>
@@ -1277,6 +2285,35 @@ Do you want to open it anyway?</source>
         <translation>Версия базы данных KeePass не поддерживается.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation>Не удается прочитать шифрования IV</translation>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation>Недопустимое количество групп</translation>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Корень</translation>
     </message>
@@ -1288,129 +2325,141 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Неверный ключ или файл базы данных повреждён.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Не база данных KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation>Не удалось выполнить преобразование ключа </translation>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Версия базы данных KeePass не поддерживается.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Неверный ключ или файл базы данных повреждён.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Невозможно вычислить мастер-пароль</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation>Не соответствует размер области данных группы</translation>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Не удалось выполнить запрос ответа.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Выбранный файл от старой KeePass 1 базы данных (.kdb).
-
-Вы можете импортировать его, нажав на База Данных &gt; «Импорт KeePass 1 базы данных...».
-Это одностороннее перемещение. Вы не сможете открыть импортированную базу данных на старой версии KeePassX 0,4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Не удалось выполнить запрос ответа.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Невозможно вычислить мастер-пароль</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Неисправимая ошибка в процессе тестирования криптографических функций.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>Ошибка - KeePassXC</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Файл блокировки не может быть создан. Режим недублирующего хранения отключен.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Другой экземпляр KeePassXC уже запущен.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
-        <translation>Запускается новый экземпляр программы, т.к. файл блокировки запуска повреждён.</translation>
+        <source>Missing group id or level</source>
+        <translation>Отсутствует групповой идентификатор или уровень</translation>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Открыть базу данных</translation>
+        <source>Missing entry field type number</source>
+        <translation>Отсутствует номер типа поля записи</translation>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Параметры базы данных</translation>
+        <source>Invalid entry field size</source>
+        <translation>Недопустимый размер поля записи</translation>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Скопировать имя пользователя в буфер обмена</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Скопировать пароль в буфер обмена</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Настройки</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Показать панель инструментов</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>только для чтения</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Переключить окно</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>База данных KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Все файлы</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Сохранить восстановленную базу данных</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Запускается новый экземпляр программы, т.к. файл блокировки запуска повреждён.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Не удалось записать базу данных.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Файл блокировки не может быть создан. Режим недублирующего хранения отключен.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Другой экземпляр KeePassXC уже запущен.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Неисправимая ошибка в процессе тестирования криптографических функций.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>Ошибка - KeePassXC</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;База данных</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Недавние базы данных</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Импорт</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Помощь</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>&amp;Записи</translation>
     </message>
@@ -1419,12 +2468,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Скопировать &amp;атрибут в буфер обмена</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation>Временной одноразовый пароль</translation>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Группы</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>&amp;Вид</translation>
+        <source>&amp;Tools</source>
+        <translation>&amp;Инструменты</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1435,6 +2488,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;О программе</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Открыть базу данных...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>&amp;Сохранить базу данных</translation>
     </message>
@@ -1475,24 +2532,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Удалить группу</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Настройки базы данных</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>&amp;Сохранить базу данных как...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Клонировать запись</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Изменение &amp;мастер-пароля...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Временный разовый пароль</translation>
+        <source>&amp;Database settings</source>
+        <translation>Настройки базы данных</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Копировать &amp;ВРП</translation>
+        <source>Database settings</source>
+        <translation>Параметры базы данных</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Показать ВРП</translation>
+        <source>&amp;Clone entry</source>
+        <translation>&amp;Клонировать запись</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1503,20 +2560,32 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Скопировать &amp;имя пользователя</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Скопировать имя пользователя в буфер обмена</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>&amp;Скопировать пароль</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Скопировать пароль в буфер обмена</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Настройки</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Генератор паролей</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>&amp;Произвести автоввод</translation>
     </message>
     <message>
         <source>&amp;Open URL</source>
-        <translation>&amp;Открыть адрес</translation>
+        <translation>&amp;Открыть URL-адрес</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
@@ -1527,165 +2596,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>&amp;Имя записи</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation>Скопировать название в буфер обмена</translation>
+    </message>
+    <message>
         <source>&amp;URL</source>
-        <translation>&amp;Адрес</translation>
+        <translation>&amp;URL-адрес</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation>Скопировать URL-адрес в буфер обмена</translation>
     </message>
     <message>
         <source>&amp;Notes</source>
         <translation>&amp;Примечания</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Генератор паролей</translation>
+        <source>Copy notes to clipboard</source>
+        <translation>Скопировать примечания в буфер обмена</translation>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Очистить историю</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;Экспорт в CSV-файл...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;База данных</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Импортировать базу данных KeePass 1...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Импорт</translation>
+        <source>Import CSV file...</source>
+        <translation>Импорт CSV-файла...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Инструменты</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Во&amp;сстановить базу данных...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Показать TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Установить TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Копировать &amp;TOTP</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Очистить корзину</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Очистить историю</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Ошибка доступа к файлу конфигурации %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Закрыть KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Похоже вы используете KeePassHTTP для интеграции с браузером. Эта функция является устаревшей и будет удалена в будущем.&lt;br&gt;Пожалуйста перейдите на KeePassXC-Browser! Чтобы получить помощь прочтите наше &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;руководство по миграции&lt;/a&gt; (предупреждение %1 of 3).&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Нажмите кнопку на YubiKey!</translation>
+        <source>read-only</source>
+        <translation>только для чтения</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Помощь</translation>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Открыть базу данных...</translation>
+        <source>Toggle window</source>
+        <translation>Переключить окно</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>&amp;Сохранить базу данных как...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Закрыть KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Изменение &amp;мастер-пароля...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>База данных KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;Экспорт в CSV-файл...</translation>
+        <source>All files</source>
+        <translation>Все файлы</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Импортировать базу данных KeePass 1...</translation>
+        <source>Open database</source>
+        <translation>Открыть базу данных</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Импорт CSV-файла...</translation>
+        <source>Save repaired database</source>
+        <translation>Сохранить восстановленную базу данных</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Во&amp;сстановить базу данных...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Не удалось записать базу данных.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Установить ВРП...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Нажмите кнопку на YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation>Недопустимый файл ключа, ожидается OpenSSH ключ</translation>
     </message>
     <message>
-        <source>General</source>
-        <translation>Общие</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Показывать уведомление при запросе учётных данных</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation>Это не ключ OpenSSH, поддерживаются только современные ключи</translation>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Сортировать совпавшие записи по &amp;имени пользователя</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Удалить все сохранённые права доступа из записей активной базы данных</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Продвинутые</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Всегда разрешать доступ к записям</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Всегда разрешать обновление записей</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Искать подходящие записи во всех открытых базах данных</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation>Поврежденный файл ключа, чтение  личного ключа не удалось</translation>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Порт HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation>В личном ключе нет сведений для дешифрования</translation>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Порт по умолчанию: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation>Неизвестный шифр: </translation>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Запрашивать разблокировку базы данных, если она заблокирована</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation>Попытка запустить ФФК без шифрования</translation>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Сортировать совпадающие записи по названию</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation>Пароль требуется для расшифровки этого ключа</translation>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC будет слушать этот порт на 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation>Формирования ключа не удалось, ключевой файл поврежден?</translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Не удаётся выполнить привязку к привилегированным портам</translation>
+        <source>Unknown KDF: </source>
+        <translation>Неизвестные ФФК: </translation>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Не удаётся привязать к привилегированным портам с номерами меньше 1024!
-Используется порт по умолчанию: 19455.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation>Расшифровка не удалась, неправильный пароль?</translation>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>&amp;Удалить все общие ключи шифрования из активной базы данных</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation>Неожиданное EOF при чтении открытого ключа</translation>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Возвращать продвинутые стро&amp;ковые поля, начинающиеся с «KPH: »</translation>
+        <source>Unknown key type: </source>
+        <translation>Неизвестный тип ключа: </translation>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Автоматическое создание или обновление полей, содержащих строки, не поддерживается.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation>Неожиданный EOF при чтении личного ключа</translation>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation>Не удается записать публичный ключ, так как он пуст</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation>Нельзя записать личный ключ, поскольку он пустой</translation>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation>Неожиданный EOF при записи личного ключа</translation>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Диалог</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1696,43 +2810,137 @@ Using default port 19455.</source>
         <translation>Включить сервер KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Общие</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Показывать уведомление при запросе учётных данных</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation>Возвращает только лучшие совпадения для определенного URL вместо всех записей для всего домена.</translation>
+        <translation>Возвращает только лучшие совпадения для определенного URL-адрес вместо всех записей для всего домена.</translation>
     </message>
     <message>
         <source>&amp;Return only best matching entries</source>
         <translation>&amp;Показывать только лучшие совпадения</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Запрашивать разблокировку базы данных, если она заблокирована</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Будут отобраны только записи с совпадающим протоколом  (http://, https://, ftp://, ...).</translation>
     </message>
     <message>
         <source>&amp;Match URL schemes</source>
-        <translation>&amp;Проверять протокол</translation>
+        <translation>&amp;Проверять протокол URL</translation>
+    </message>
+    <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Сортировать совпавшие записи по &amp;имени пользователя</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Сортировать совпадающие записи по названию</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>&amp;Удалить все общие ключи шифрования из активной базы данных</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Удалить все сохранённые права доступа из записей активной базы данных</translation>
     </message>
     <message>
         <source>Password Generator</source>
         <translation>Генератор паролей</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Продвинутые</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Всегда разрешать доступ к записям</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Всегда разрешать обновление записей</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>К клиенту должна быть подключена только выбранная база данных.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Следующие параметры могут быть опасны!
-Меняйте их, только если знаете, что делаете.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Искать подходящие записи во всех открытых базах данных</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Автоматическое создание или обновление полей, содержащих строки, не поддерживается.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Возвращать продвинутые стро&amp;ковые поля, начинающиеся с «KPH: »</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Порт HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Порт по умолчанию: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC будет слушать этот порт на 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation>&lt;b&gt;Внимание:&lt;/b&gt; Следующие параметры могут быть опасны!</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation>&lt;p&gt;KeePassHTTP устарел и будет удален в будущем.&lt;br&gt;Поажлуйста перейдите на KeePassXC-Browser! Чтобы получить помощь прочтите наше &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;руководство по миграции&lt;/a&gt;.&lt;/p&gt;</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Не удаётся выполнить привязку к привилегированным портам</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Не удаётся привязать к привилегированным портам с номерами меньше 1024!
+Используется порт по умолчанию: 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Пароль:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>надёжность</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>энтропия</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Виды символов</translation>
     </message>
@@ -1750,41 +2958,53 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Special Characters</source>
-        <translation>Особые символы</translation>
+        <translation>Специальные символы</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation>Расширенный ASCII</translation>
     </message>
     <message>
         <source>Exclude look-alike characters</source>
-        <translation>Исключить похожие символы</translation>
+        <translation>Исключить визуально схожие символы</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Принять</translation>
+        <source>Pick characters from every group</source>
+        <translation>Подобрать символы из каждой группы</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Длина:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>надёжность</translation>
+        <source>Passphrase</source>
+        <translation>Парольная фраза</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>энтропия</translation>
+        <source>Wordlist:</source>
+        <translation>Список слов:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Длина:</translation>
+        <source>Word Count:</source>
+        <translation>Количество слов:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Подобрать символы из каждой группы</translation>
+        <source>Word Separator:</source>
+        <translation>Разделитель слов:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Генерировать</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Копировать</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Принять</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
@@ -1802,51 +3022,273 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Плохое</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Слабое</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Хорошее</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Отличное</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Пароль</translation>
+        <source>Database not opened</source>
+        <translation>База данных не открыта</translation>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Расширенный ASCII</translation>
+        <source>Database hash not available</source>
+        <translation>Отсутствует хэш базы данных</translation>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Парольная фраза</translation>
+        <source>Client public key not received</source>
+        <translation>Не получен открытый ключ клиента</translation>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Список слов:</translation>
+        <source>Cannot decrypt message</source>
+        <translation>Не удается расшифровать сообщение</translation>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Количество слов:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation>Истекло время ожидания или невозможно подключиться к KeePassXC</translation>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Разделитель слов:</translation>
+        <source>Action cancelled or denied</source>
+        <translation>Действие отменено или запрещено</translation>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Копировать</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation>Не удается зашифровать сообщение или открытый ключ не найден. Механизм Native Messaging включен в KeePassXC?</translation>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation>KeePassXC объединение не удалось, попробуйте еще раз</translation>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation>Изменение ключа не было успешным</translation>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation>Ключ шифрования не распознан</translation>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation>Сохраненная база данных не найдена</translation>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation>Неправильное действие</translation>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation>Получено пустое сообщение</translation>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation>Отсутствует URL-адрес</translation>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation>Логины не найдены</translation>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation>Неизвестная ошибка</translation>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Путь к базе данных.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation>путь</translation>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation>имя пользователя</translation>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation>URL-адрес для записи</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL-адрес</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation>длина</translation>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation>Скопировать пароль в буфер обмена.</translation>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation>Скопировать путь до записи.</translation>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation>Время ожидания в секундах до очистки буфера обмена.</translation>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation>Редактирование записи.</translation>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation>Название для записи.</translation>
+    </message>
+    <message>
+        <source>title</source>
+        <translation>название</translation>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Извлечь и распечатать содержимое базы данных.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Путь к базе данных для извлечения.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation>
+
+Доступные команды:
+</translation>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Имя выполняемой команды.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Список записей в базе данных.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Путь к списку группы. Значение по умолчанию /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation>Найти записи быстро.</translation>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation>Поисковый запрос.</translation>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Объединить две базы данных.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Путь к базе данных для объединения в.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Путь к базе данных для слияния.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation>Используйте те же учетные данные для обоих файлов базы данных.</translation>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation>Файл ключа базы данных для слияния.</translation>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation>Показать сведения о записях.</translation>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation>атрибут</translation>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Название записи для отображения.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>Устройство NULL</translation>
@@ -1870,8 +3312,28 @@ Change them only if you know what you are doing.</source>
         <translation>Отсутствует закрывающая цитата</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>Внутренний - превышение нижней границы</translation>
+        <source>AES: 256-bit</source>
+        <translation>AES: 256-бит</translation>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation>Twofish: 256-бит</translation>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation>ChaCha20: 256-бит</translation>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2 (KDBX 4 – рекомендуемый)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF (KDBX 4)</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF (KDBX 3.1)</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1890,14 +3352,22 @@ Change them only if you know what you are doing.</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>Адрес</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Примечания</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation>Последнее изменение</translation>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation>Создан</translation>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation>Устаревшая интеграция с браузером</translation>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Интеграция с браузером</translation>
     </message>
@@ -1913,6 +3383,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>Пассивная</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation>SSH Агент</translation>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1951,8 +3425,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Чувствительно к регистру</translation>
+        <source>Search...</source>
+        <translation>Поиск...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1963,8 +3437,8 @@ Change them only if you know what you are doing.</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Поиск...</translation>
+        <source>Case Sensitive</source>
+        <translation>Чувствительно к регистру</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1974,50 +3448,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Общий ключ шифрования с именем «%1» уже существует.
-Перезаписать его?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Обновить информацию в %1 - %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Активная база данных заблокирована!
-Разблокируйте выбранную базу данных или выберите другую, незаблокированную.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Успешно удалено %1 шифрование-%2 из настроек KeePassXC/Http.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Не найдено общих ключей шифрования в настройках KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Активная база данных не содержит записей настроек KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Удаляю сохранённые права доступа...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Прервать</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Права доступа из %1 %2 успешно удалены.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Активная база данных не содержит записей с назначенными правами доступа.</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: Запрос на ассоциацию нового ключа</translation>
     </message>
@@ -2034,33 +3464,77 @@ give it a unique name to identify and accept it.</source>
         <translation>KeePassXC: Перезаписать существующий ключ?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Общий ключ шифрования с именем «%1» уже существует.
+Перезаписать его?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: Обновить запись</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Обновить информацию в %1 - %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: База данных заблокирована!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Активная база данных заблокирована!
+Разблокируйте выбранную базу данных или выберите другую, незаблокированную.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: Ключи удалены из базы данных</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation><numerusform>Успешно удалена %n шифрования-ключи от параметров KeePassX/Http.</numerusform><numerusform>Успешно удалена %n шифрования-ключи от параметров KeePassX/Http.</numerusform><numerusform>Успешно удалена %n шифрования-ключи от параметров KeePassX/Http.</numerusform><numerusform>Успешно удалено %n ключей шифрования из параметров KeePassX/Http.</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: Ключи не найдены</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Не найдено общих ключей шифрования в настройках KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: Настройки недоступны!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Активная база данных не содержит записей настроек KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Удаляю сохранённые права доступа...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Прервать</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Права доступа удалены</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation><numerusform>Успешно удалены разрешения %n записей.</numerusform><numerusform>Успешно удалены разрешения %n записей.</numerusform><numerusform>Успешно удалены разрешения %n записей.</numerusform><numerusform>Успешно удалены доступы для %n записей.</numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: Не найдена запись с правами доступа!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Активная база данных не содержит записей с назначенными правами доступа.</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2084,10 +3558,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Основные параметры</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Запускать только один экземпляр KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Запоминать последнюю базу данных</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Запоминать последние использованные файлы ключей и устройства</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Загружать предыдущие базы данных при запуске</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Автоматически сохранять при выходе</translation>
     </message>
@@ -2096,20 +3586,28 @@ give it a unique name to identify and accept it.</source>
         <translation>Автоматически сохранять после каждого изменения</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Автоматически перезагружать базу данных при её изменении извне</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Сворачивать при копировании в буфер обмена</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Сворачивать окно при запуске приложения</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Использовать значок группы для новых записей</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Глобальная комбинация клавиш для автоввода</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Не помечать базу данных изменённой при действиях, не связанных с изменением данных (например, при распахивании групп)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Язык</translation>
+        <source>Hide the Details view</source>
+        <translation>Скрыть подробную информацию</translation>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,66 +3618,60 @@ give it a unique name to identify and accept it.</source>
         <translation>При сворачивании скрывать окно в системный лоток</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Загружать предыдущие базы данных при запуске</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Автоматически перезагружать базу данных при её изменении извне</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Скрывать окно в системный лоток вместо выхода</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Сворачивать окно при запуске приложения</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Основные параметры</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Запоминать последние использованные файлы ключей и устройства</translation>
+        <source>Dark system tray icon</source>
+        <translation>Темная иконка в системном трее</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Не помечать базу данных изменённой при действиях, не связанных с изменением данных (например, при распахивании групп)</translation>
+        <source>Language</source>
+        <translation>Язык</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Автоввод</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Использовать для поиска URL и название записи</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation>Использовать название записи, для глобального автоввода</translation>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation>Использовать URL-адрес для глобального автоввода</translation>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Всегда спрашивать перед выполнением автоввода</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Глобальная комбинация клавиш для автоввода</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Задержка автоввода</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation> мс</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Запускать только один экземпляр KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Таймауты</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Очищать буфер обмена через</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>сек</translation>
     </message>
     <message>
@@ -2187,28 +3679,32 @@ give it a unique name to identify and accept it.</source>
         <translation>Блокировать базу данных при отсутствии активности длительностью</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>По умолчанию показывать пароль в открытую</translation>
+        <source>Convenience</source>
+        <translation>Удобство</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Блокировать базу данных при закрытии сеанса или закрытии крышки</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation>Блокировать базу данных при сворачивания окна</translation>
+        <translation>Блокировать базу данных при сворачивание окна</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
         <translation>Не требовать повторный ввод пароля, когда он показывается</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Таймауты</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>По умолчанию показывать пароль в открытую</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Удобство</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation>Скрыть пароли в панели предварительного просмотра</translation>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Блокировать базу данных при закрытии сеанса или закрытии крышки</translation>
+        <source>Hide entry notes by default</source>
+        <translation>Скрыть примечания записи по умолчанию</translation>
     </message>
     <message>
         <source>Privacy</source>
@@ -2223,13 +3719,21 @@ give it a unique name to identify and accept it.</source>
     <name>SetupTotpDialog</name>
     <message>
         <source>Setup TOTP</source>
-        <translation>Настроить ВРП</translation>
+        <translation>Настроить TOTP</translation>
     </message>
     <message>
         <source>Key:</source>
         <translation>Ключ:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation>Стандартные настройки токена RFC 6238</translation>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation>Настройки Steam токена</translation>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Использовать пользовательские настройки</translation>
     </message>
@@ -2255,6 +3759,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>сек</translation>
     </message>
 </context>
@@ -2322,88 +3827,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>путь к своему файлу настроек</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>файл-ключ базы данных</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - кроссплатформенный менеджер паролей</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>читать пароли базы данных из стандартного ввода «stdin»</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>имена файлов открываемой базы данных паролей (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Скопировать пароль в буфер обмена</translation>
+        <source>Remove an entry from the database.</source>
+        <translation>Удалить запись из базы данных.</translation>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Путь к базе данных.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Использовать подсказку GUI для разблокировки базы данных.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Имя записи для отсечения.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Извлечь и распечатать содержимое базы данных.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Путь к базе данных для извлечения.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Имя выполняемой команды.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Список записей в базе данных.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation>Путь к записи, для удаления.</translation>
     </message>
     <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Путь к списку группы. Значение по умолчанию /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Распечатать UUID записей и групп.</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>Объединить две базы данных.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - кроссплатформенный менеджер паролей</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Путь к базе данных для объединения в.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>имена файлов открываемой базы данных паролей (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Путь к базе данных для слияния.</translation>
+        <source>path to a custom config file</source>
+        <translation>путь к своему файлу настроек</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Использовать тот же пароль для обоих файлов базы данных.</translation>
+        <source>key file of the database</source>
+        <translation>ключ-файл базы данных</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Показать пароль.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>читать пароли базы данных из стандартного ввода «stdin»</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Название записи для отображения.</translation>
+        <source>Parent window handle</source>
+        <translation>Дескриптор родительского окна</translation>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_th.ts b/share/translations/keepassx_th.ts
new file mode 100644
index 000000000..9e4df6055
--- /dev/null
+++ b/share/translations/keepassx_th.ts
@@ -0,0 +1,3831 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="th" version="2.1">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <source>About KeePassXC</source>
+        <translation>เกี่ยวกับ KeePassXC</translation>
+    </message>
+    <message>
+        <source>About</source>
+        <translation>เกี่ยวกับ</translation>
+    </message>
+    <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>รายงานข้อผิดพลาดที่: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC เผยแพร่ภายใต้เงื่อนไขของสัญญาอนุญาตสาธารณะทั่วไปของกนู (GNU GPL) 
+รุ่น 2 หรือรุ่น 3  (คุณสามารถเลือกได้)</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>ผู้บำรุงรักษาโครงการ:</translation>
+    </message>
+    <message>
+        <source>Contributors</source>
+        <translation>ผู้ร่วมสมทบ</translation>
+    </message>
+    <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;ดูรายชื่อผู้สมทบบน GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>Debug Info</source>
+        <translation>ข้อมูลดีบัก</translation>
+    </message>
+    <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>ใส่ข้อมูลดังต่อไปนี้ทุกครั้งที่คุณรายงานข้อผิดปกติของซอฟต์แวร์:</translation>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>คัดลอกไปยังคลิปบอร์ด:</translation>
+    </message>
+    <message>
+        <source>Version %1
+</source>
+        <translation>รุ่น %1
+</translation>
+    </message>
+    <message>
+        <source>Revision: %1</source>
+        <translation>การปรับปรุง: %1</translation>
+    </message>
+    <message>
+        <source>Distribution: %1</source>
+        <translation>การจัดจำหน่าย: %1</translation>
+    </message>
+    <message>
+        <source>Libraries:</source>
+        <translation>ไลบรารี:</translation>
+    </message>
+    <message>
+        <source>Operating system: %1
+CPU architecture: %2
+Kernel: %3 %4</source>
+        <translation>ระบบปฏิบัติการ: %1
+สถาปัตยกรรม CPU: %2
+เคอร์เนล: %3 %4</translation>
+    </message>
+    <message>
+        <source>Enabled extensions:</source>
+        <translation>ส่วนขยายที่เปิดใช้:</translation>
+    </message>
+</context>
+<context>
+    <name>AccessControlDialog</name>
+    <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>จำการตัดสินใจนี้</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>อนุญาต</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>ปฏิเสธ</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
+    <message>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoType</name>
+    <message>
+        <source>Couldn&apos;t find an entry that matches the window title:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Type - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AutoTypeAssociationsModel</name>
+    <message>
+        <source>Window</source>
+        <translation>หน้าต่าง</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>ลำดับ</translation>
+    </message>
+    <message>
+        <source>Default sequence</source>
+        <translation>ลำดับมาตรฐาน</translation>
+    </message>
+</context>
+<context>
+    <name>AutoTypeSelectDialog</name>
+    <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Auto-Type - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Select entry to Auto-Type:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>จำการตัดสินใจนี้</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>อนุญาต</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>ปฏิเสธ</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>ขั้นสูง</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: เขียนทับกุญแจที่มีอยู่เดิม?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: ปรับปรุงรายการ</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: ฐานข้อมูลล็อกอยู่!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: ไม่มีการตั้งค่าที่ใช้ได้!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: ไม่พบกุญแจ</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: เอากุญแจออกจากฐานข้อมูล</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>หยุด</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: การอนุญาตถูกนำออก</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ChangeMasterKeyWidget</name>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Enter password:</source>
+        <translation>ป้อนรหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>Repeat password:</source>
+        <translation>ทวนรหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>&amp;Key file</source>
+        <translation>แฟ้มกุญแจ (&amp;K)</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>ดู</translation>
+    </message>
+    <message>
+        <source>Create</source>
+        <translation>สร้าง</translation>
+    </message>
+    <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>รหัสสอบถาม รหัสตอบกลับ (&amp;L)</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>เรียกใหม่</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>แฟ้มกุญแจ</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
+    </message>
+    <message>
+        <source>Create Key File...</source>
+        <translation>สร้างแฟ้มกุญแจ...</translation>
+    </message>
+    <message>
+        <source>Unable to create Key File : </source>
+        <translation>ไม่สามารถสร้างแฟ้มกุญแจได้ :</translation>
+    </message>
+    <message>
+        <source>Select a key file</source>
+        <translation>เลือกแฟ้มกุญแจ</translation>
+    </message>
+    <message>
+        <source>Empty password</source>
+        <translation>รหัสผ่านว่างเปล่า</translation>
+    </message>
+    <message>
+        <source>Do you really want to use an empty string as password?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>รหัสผ่านที่ให้มาไม่ตรงกัน</translation>
+    </message>
+    <message>
+        <source>Failed to set %1 as the Key file:
+%2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Changing master key failed: no YubiKey inserted.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CloneDialog</name>
+    <message>
+        <source>Clone Options</source>
+        <translation>ตัวเลือกการโคลน</translation>
+    </message>
+    <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>เติม &apos;- โคลน&apos; ต่อท้ายชื่อ</translation>
+    </message>
+    <message>
+        <source>Replace username and password with references</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy history</source>
+        <translation>ทำสำเนาประวัติ</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWidget</name>
+    <message>
+        <source>Import CSV fields</source>
+        <translation>นำเข้าฟิลด์ CSV</translation>
+    </message>
+    <message>
+        <source>filename</source>
+        <translation>ชื่อแฟ้ม</translation>
+    </message>
+    <message>
+        <source>size, rows, columns</source>
+        <translation>ขนาด, แถว, หลัก</translation>
+    </message>
+    <message>
+        <source>Encoding</source>
+        <translation>การเข้ารหัส</translation>
+    </message>
+    <message>
+        <source>Codec</source>
+        <translation>ตัวเข้ารหัส</translation>
+    </message>
+    <message>
+        <source>Text is qualified by</source>
+        <translation>ข้อความถูกกำกับด้วย</translation>
+    </message>
+    <message>
+        <source>Fields are separated by</source>
+        <translation>ฟิลด์ถูกแบ่งด้วย</translation>
+    </message>
+    <message>
+        <source>Comments start with</source>
+        <translation>บันทึกความเห็นเริ่มต้นด้วย</translation>
+    </message>
+    <message>
+        <source>First record has field names</source>
+        <translation>เรคคอร์ดแรกมีชื่อฟิลด์</translation>
+    </message>
+    <message>
+        <source>Number of headers line to discard</source>
+        <translation>จำนวนบรรทัดส่วนหัวที่จะไม่สนใจ</translation>
+    </message>
+    <message>
+        <source>Consider &apos;\&apos; an escape character</source>
+        <translation>ให้นับ &apos;\&apos; เป็น escape character</translation>
+    </message>
+    <message>
+        <source>Preview</source>
+        <translation>ดูตัวอย่าง</translation>
+    </message>
+    <message>
+        <source>Column layout</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not present in CSV file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty fieldname </source>
+        <translation>ชื่อฟิลด์ว่างเปล่า</translation>
+    </message>
+    <message>
+        <source>column </source>
+        <translation>หลัก</translation>
+    </message>
+    <message>
+        <source>Imported from CSV file</source>
+        <translation>นำเข้าจากแฟ้ม CSV แล้ว</translation>
+    </message>
+    <message>
+        <source>Original data: </source>
+        <translation>ข้อมูลต้นฉบับ:</translation>
+    </message>
+    <message>
+        <source>Error(s) detected in CSV file !</source>
+        <translation>พบข้อผิดพลาดในแฟ้ม CSV !</translation>
+    </message>
+    <message>
+        <source> more messages skipped]</source>
+        <translation>มีข้อความอีกมากที่ถูกข้ามไป]</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ผิดพลาด</translation>
+    </message>
+    <message>
+        <source>CSV import: writer has errors:
+</source>
+        <translation>การนำเข้า CSV: ตัวเขียนมีข้อผิดพลาด:
+</translation>
+    </message>
+</context>
+<context>
+    <name>CsvImportWizard</name>
+    <message>
+        <source>Error</source>
+        <translation>ผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+</context>
+<context>
+    <name>CsvParserModel</name>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseOpenWidget</name>
+    <message>
+        <source>Enter master key</source>
+        <translation>ใส่กุญแจมาสเตอร์</translation>
+    </message>
+    <message>
+        <source>Key File:</source>
+        <translation>แฟ้มกุญแจ:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>รหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>Browse</source>
+        <translation>ดู</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>เรียกใหม่</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>รหัสสอบถาม รหัสตอบกลับ:</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
+    </message>
+    <message>
+        <source>Can&apos;t open key file</source>
+        <translation>ไม่สามารถเปิดแฟ้มกุญแจ</translation>
+    </message>
+    <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
+    </message>
+    <message>
+        <source>Key files</source>
+        <translation>แฟ้มกุญแจ</translation>
+    </message>
+    <message>
+        <source>Select key file</source>
+        <translation>เลือกแฟ้มกุญแจ</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseRepairWidget</name>
+    <message>
+        <source>Repair database</source>
+        <translation>ซ่อมฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Error</source>
+        <translation>ผิดพลาด</translation>
+    </message>
+    <message>
+        <source>Can&apos;t open key file</source>
+        <translation>ไม่สามารถเปิดแฟ้มกุญแจ</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
+    </message>
+    <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>ฐานข้อมูลเปิดได้ปกติ ไม่ต้องทำอะไร</translation>
+    </message>
+    <message>
+        <source>Success</source>
+        <translation>สำเร็จ</translation>
+    </message>
+    <message>
+        <source>The database has been successfully repaired
+You can now save it.</source>
+        <translation>ฐานข้อมูลดังกล่าวถูกซ่อมสำเร็จแล้ว
+ตอนนี้คุณสามารถบันทึกมันได้</translation>
+    </message>
+    <message>
+        <source>Unable to repair the database.</source>
+        <translation>ไม่สามารถซ่อมฐานข้อมูลดังกล่าว</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidget</name>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES:  256 Bit   (default)</source>
+        <translation>AES:  256 บิต   (ค่าปริยาย)</translation>
+    </message>
+    <message>
+        <source>Twofish:  256 Bit</source>
+        <translation>Twofish:  256 บิต</translation>
+    </message>
+    <message>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>รอบเปลี่ยนรูป:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>ชื่อฐานข้อมูล:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>รายละเอียดฐานข้อมูล:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>ชื่อผู้ใช้มาตรฐาน:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>จำนวนมากสุดของรายการประวัติ:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>ขนาดมากสุดของรายการประวัติ:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>ใช้ถังขยะรีไซเคิล</translation>
+    </message>
+</context>
+<context>
+    <name>DatabaseTabWidget</name>
+    <message>
+        <source>Root</source>
+        <comment>Root group</comment>
+        <translation>รูต</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>ฐานข้อมูล KeePass 2</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>เปิดฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>File not found!</source>
+        <translation>ไม่พบแฟ้ม!</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
+    </message>
+    <message>
+        <source>File opened in read only mode.</source>
+        <translation>เปิดแฟ้มแล้วในแบบอ่านอย่างเดียว</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>เปิดแฟ้ม CSV</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>แฟ้ม CSV</translation>
+    </message>
+    <message>
+        <source>All files (*)</source>
+        <translation>ทุกแฟ้ม ()</translation>
+    </message>
+    <message>
+        <source>Merge database</source>
+        <translation>ผสานฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>เปิดฐานข้อมูล KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>ฐานข้อมูล KeePass 1</translation>
+    </message>
+    <message>
+        <source>Close?</source>
+        <translation>ปิด?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save changes?</source>
+        <translation>บันทึกความเปลี่ยนแปลง?</translation>
+    </message>
+    <message>
+        <source>&quot;%1&quot; was modified.
+Save changes?</source>
+        <translation>&quot;%1&quot; ถูกแก้ไข
+บันทึกการเปลี่ยนแปลง?</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>การเขียนฐานข้อมูลล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Passwords</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Save database as</source>
+        <translation>บันทึกฐานข้อมูลเป็น</translation>
+    </message>
+    <message>
+        <source>Export database to CSV file</source>
+        <translation>ส่งออกฐานข้อมูลเป็นแฟ้ม CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>การเขียนแฟ้ม CSV ล้มเหลว</translation>
+    </message>
+    <message>
+        <source>New database</source>
+        <translation>ฐานข้อมูลใหม่</translation>
+    </message>
+    <message>
+        <source>locked</source>
+        <translation>ถูกล็อก</translation>
+    </message>
+    <message>
+        <source>Lock database</source>
+        <translation>ล็อกฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Can't lock the database as you are currently editing it.
+Please press cancel to finish your changes or discard them.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This database has been modified.
+Do you want to save the database before locking it?
+Otherwise your changes are lost.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
+    <message>
+        <source>Searching...</source>
+        <translation>ค้นหา...</translation>
+    </message>
+    <message>
+        <source>Change master key</source>
+        <translation>เปลี่ยนกุญแจมาสเตอร์</translation>
+    </message>
+    <message>
+        <source>Delete entry?</source>
+        <translation>ลบรายการ?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation>คุณต้องการจะลบรายการ &quot;%1&quot; ให้หายไปตลอดกาลจริงๆ?</translation>
+    </message>
+    <message>
+        <source>Delete entries?</source>
+        <translation>ลบรายการ?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete %1 entries for good?</source>
+        <translation>คุณต้องการจะลบรายการ %1 รายการให้หายไปตลอดกาลจริงๆ?</translation>
+    </message>
+    <message>
+        <source>Move entry to recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Move entries to recycle bin?</source>
+        <translation>ย้ายรายการไปถังขยะ?</translation>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Execute command?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember my choice</source>
+        <translation>จำที่ฉันเลือก</translation>
+    </message>
+    <message>
+        <source>Delete group?</source>
+        <translation>ลบกลุ่ม?</translation>
+    </message>
+    <message>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+    <message>
+        <source>No current database.</source>
+        <translation>ไม่มีฐานข้อมูลขณะนี้</translation>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation>ไม่มีฐานข้อมูลต้นทาง ไม่มีงานให้ทำ</translation>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation>ผลลัพธ์การค้นหา (%1)</translation>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation>ไม่มีผลลัพธ์</translation>
+    </message>
+    <message>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge Request</source>
+        <translation>ผสานคำร้อง</translation>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>ปิด</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ชื่อผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>แฟ้มแนบ</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>หน้าต่าง</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>ลำดับ</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>ค้นหา</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>ล้าง</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidget</name>
+    <message>
+        <source>Entry</source>
+        <translation>รายการ</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>ขั้นสูง</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>ไอคอน</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>คุณสมบัติ</translation>
+    </message>
+    <message>
+        <source>History</source>
+        <translation>ประวัติ</translation>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry history</source>
+        <translation>ประวัติรายการ</translation>
+    </message>
+    <message>
+        <source>Add entry</source>
+        <translation>เพิ่มรายการ</translation>
+    </message>
+    <message>
+        <source>Edit entry</source>
+        <translation>แก้ไขรายการ</translation>
+    </message>
+    <message>
+        <source>Different passwords supplied.</source>
+        <translation>รหัสผ่านที่ให้มาไม่ตรงกัน</translation>
+    </message>
+    <message>
+        <source>New attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>ยืนยันการนำออก</translation>
+    </message>
+    <message>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Tomorrow</source>
+        <translation>พรุ่งนี้</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n week(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message numerus="yes">
+        <source>%n month(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>1 year</source>
+        <translation>1 ปี</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAdvanced</name>
+    <message>
+        <source>Additional attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>เพิ่ม</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>นำออก</translation>
+    </message>
+    <message>
+        <source>Edit Name</source>
+        <translation> แก้ไขชื่อ</translation>
+    </message>
+    <message>
+        <source>Protect</source>
+        <translation>ป้องกัน</translation>
+    </message>
+    <message>
+        <source>Reveal</source>
+        <translation>เปิดเผย</translation>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>แฟ้มแนบ</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetAutoType</name>
+    <message>
+        <source>Enable Auto-Type for this entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>+</source>
+        <translation>+</translation>
+    </message>
+    <message>
+        <source>-</source>
+        <translation>-</translation>
+    </message>
+    <message>
+        <source>Window title:</source>
+        <translation>หัวเรื่องของหน้าต่าง:</translation>
+    </message>
+    <message>
+        <source>Use default se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set custo&amp;m sequence:</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetHistory</name>
+    <message>
+        <source>Show</source>
+        <translation>แสดง</translation>
+    </message>
+    <message>
+        <source>Restore</source>
+        <translation>เรียกคืน</translation>
+    </message>
+    <message>
+        <source>Delete</source>
+        <translation>ลบ</translation>
+    </message>
+    <message>
+        <source>Delete all</source>
+        <translation>ลบทั้งหมด</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetMain</name>
+    <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>รหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>ทำซ้ำ:</translation>
+    </message>
+    <message>
+        <source>Title:</source>
+        <translation>หัวเรื่อง:</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation>ค่าปรับแต่งสำเร็จรูป</translation>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>ชื่อผู้ใช้:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>หมดอายุ</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>คัดลอกไปยังคลิปบอร์ด:</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidget</name>
+    <message>
+        <source>Group</source>
+        <translation>กลุ่ม</translation>
+    </message>
+    <message>
+        <source>Icon</source>
+        <translation>ไอคอน</translation>
+    </message>
+    <message>
+        <source>Properties</source>
+        <translation>คุณสมบัติ</translation>
+    </message>
+    <message>
+        <source>Add group</source>
+        <translation>เพิ่มกลุ่ม</translation>
+    </message>
+    <message>
+        <source>Edit group</source>
+        <translation>แก้ไขกลุ่ม</translation>
+    </message>
+    <message>
+        <source>Enable</source>
+        <translation>เปิดใช้</translation>
+    </message>
+    <message>
+        <source>Disable</source>
+        <translation>ปิดใช้</translation>
+    </message>
+    <message>
+        <source>Inherit from parent group (%1)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditGroupWidgetMain</name>
+    <message>
+        <source>Name</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>หมดอายุ</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>ค้นหา</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>&amp;Use default Auto-Type sequence of parent group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Set default Auto-Type se&amp;quence</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetIcons</name>
+    <message>
+        <source>&amp;Use default icon</source>
+        <translation>ใช้ไอคอนมาตรฐาน (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>ใช้ไอคอนที่กำหนดเอง (&amp;M)</translation>
+    </message>
+    <message>
+        <source>Add custom icon</source>
+        <translation>เพิ่มไอคอนที่กำหนดเอง</translation>
+    </message>
+    <message>
+        <source>Delete custom icon</source>
+        <translation>ลบไอคอนที่กำหนดเอง</translation>
+    </message>
+    <message>
+        <source>Download favicon</source>
+        <translation>ดาวน์โหลด favicon</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>ไม่สามารถดึง favicon ได้</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Images</source>
+        <translation>ภาพ</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
+    </message>
+    <message>
+        <source>Select Image</source>
+        <translation>เลือกภาพ</translation>
+    </message>
+    <message>
+        <source>Can&apos;t read icon</source>
+        <translation>ไม่สามารถอ่านไอคอน</translation>
+    </message>
+    <message>
+        <source>Custom icon already exists</source>
+        <translation>มีไอคอนที่กำหนดเองอยู่แล้ว</translation>
+    </message>
+    <message>
+        <source>Confirm Delete</source>
+        <translation>ยืนยันการลบ</translation>
+    </message>
+    <message>
+        <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EditWidgetProperties</name>
+    <message>
+        <source>Created:</source>
+        <translation>สร้าง:</translation>
+    </message>
+    <message>
+        <source>Modified:</source>
+        <translation>แก้ไข:</translation>
+    </message>
+    <message>
+        <source>Accessed:</source>
+        <translation>เข้าถึง:</translation>
+    </message>
+    <message>
+        <source>Uuid:</source>
+        <translation>Uuid:</translation>
+    </message>
+</context>
+<context>
+    <name>Entry</name>
+    <message>
+        <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
+        <translation> - โคลน</translation>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>ชื่อ</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>เพิ่ม</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>นำออก</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>เปิด</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>ยืนยันการนำออก</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttributesModel</name>
+    <message>
+        <source>Name</source>
+        <translation>ชื่อ</translation>
+    </message>
+</context>
+<context>
+    <name>EntryHistoryModel</name>
+    <message>
+        <source>Last modified</source>
+        <translation>ถูกแก้ไขครั้งสุดท้าย</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>หัวเรื่อง</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ชื่อผู้ใช้</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+</context>
+<context>
+    <name>EntryModel</name>
+    <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>อ้างอิง:</translation>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>กลุ่ม</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>หัวเรื่อง</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ชื่อผู้ใช้</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+</context>
+<context>
+    <name>Group</name>
+    <message>
+        <source>Recycle Bin</source>
+        <translation>ถังขยะ</translation>
+    </message>
+</context>
+<context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>HttpPasswordGeneratorWidget</name>
+    <message>
+        <source>Length:</source>
+        <translation>ความยาว:</translation>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation>ชนิดอักขระ</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation>อักษรตัวพิมพ์ใหญ่</translation>
+    </message>
+    <message>
+        <source>A-Z</source>
+        <translation>A-Z</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>อักษรตัวพิมพ์เล็ก</translation>
+    </message>
+    <message>
+        <source>a-z</source>
+        <translation>a-z</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>ตัวเลข</translation>
+    </message>
+    <message>
+        <source>0-9</source>
+        <translation>0-9</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>อักขระพิเศษ</translation>
+    </message>
+    <message>
+        <source>/*_&amp; ...</source>
+        <translation>/*_&amp; ...</translation>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation>ไม่ใช้อักขระที่หน้าตาคล้ายกัน</translation>
+    </message>
+    <message>
+        <source>Ensure that the password contains characters from every group</source>
+        <translation>ทำให้แน่ใจว่ารหัสผ่านมีอักขระจากทุกกลุ่ม</translation>
+    </message>
+</context>
+<context>
+    <name>KMessageWidget</name>
+    <message>
+        <source>&amp;Close</source>
+        <translation>ปิด (&amp;C)</translation>
+    </message>
+    <message>
+        <source>Close message</source>
+        <translation>ปิดข้อความ</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>ไม่ใช่ฐานข้อมูล KeePass</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KeePass1OpenWidget</name>
+    <message>
+        <source>Import KeePass1 database</source>
+        <translation>นำเข้าฐานข้อมูล KeePass1</translation>
+    </message>
+    <message>
+        <source>Unable to open the database.</source>
+        <translation>ไม่สามารถเปิดฐานข้อมูลดังกล่าว</translation>
+    </message>
+</context>
+<context>
+    <name>KeePass1Reader</name>
+    <message>
+        <source>Unable to read keyfile.</source>
+        <translation>ไม่สามารถอ่านแฟ้มกุญแจได้</translation>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>ไม่ใช่ฐานข้อมูล KeePass</translation>
+    </message>
+    <message>
+        <source>Unsupported encryption algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass database version.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Root</source>
+        <translation>รูต</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>ไม่สามารถคำนวญกุญแมาสเตอร์ได้</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing group id or level</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - ข้อผิดพลาด</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>ฐานข้อมูล (&amp;D)</translation>
+    </message>
+    <message>
+        <source>&amp;Recent databases</source>
+        <translation>ฐานข้อมูลที่เพิ่งใช้ (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Import</source>
+        <translation>นำเข้า</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>ช่วยเหลือ (&amp;H)</translation>
+    </message>
+    <message>
+        <source>E&amp;ntries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy att&amp;ribute to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Groups</source>
+        <translation>กลุ่ม (&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Tools</source>
+        <translation>เครื่องมือ (&amp;T)</translation>
+    </message>
+    <message>
+        <source>&amp;Quit</source>
+        <translation>ออก (&amp;Q)</translation>
+    </message>
+    <message>
+        <source>&amp;About</source>
+        <translation>เกี่ยวกับ (&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Open database...</source>
+        <translation>เปิดฐานข้อมูล (&amp;O)...</translation>
+    </message>
+    <message>
+        <source>&amp;Save database</source>
+        <translation>บันทึกฐานข้อมูล (&amp;S)</translation>
+    </message>
+    <message>
+        <source>&amp;Close database</source>
+        <translation>ปิดฐานข้อมูล (&amp;C)</translation>
+    </message>
+    <message>
+        <source>&amp;New database</source>
+        <translation>ฐานข้อมูลใหม่ (&amp;N)</translation>
+    </message>
+    <message>
+        <source>Merge from KeePassX database</source>
+        <translation>ผสานจากฐานข้อมูล KeePassX</translation>
+    </message>
+    <message>
+        <source>&amp;Add new entry</source>
+        <translation>เพิ่มรายการใหม่ (&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;View/Edit entry</source>
+        <translation>ดูและแก้ไขรายการ (&amp;V)</translation>
+    </message>
+    <message>
+        <source>&amp;Delete entry</source>
+        <translation>ลบรายการ (&amp;D)</translation>
+    </message>
+    <message>
+        <source>&amp;Add new group</source>
+        <translation>เพิ่มกลุ่มใหม่ (&amp;A)</translation>
+    </message>
+    <message>
+        <source>&amp;Edit group</source>
+        <translation>แก้ไขกลุ่ม (&amp;E)</translation>
+    </message>
+    <message>
+        <source>&amp;Delete group</source>
+        <translation>ลบกลุ่ม (&amp;D)</translation>
+    </message>
+    <message>
+        <source>Sa&amp;ve database as...</source>
+        <translation>บันทึกฐานข้อมูลเป็น (&amp;V)...</translation>
+    </message>
+    <message>
+        <source>Change &amp;master key...</source>
+        <translation>เปลี่ยนกุญแจมาสเตอร์ (&amp;M)</translation>
+    </message>
+    <message>
+        <source>&amp;Database settings</source>
+        <translation>การตั้งค่าฐานข้อมูล (&amp;D)</translation>
+    </message>
+    <message>
+        <source>Database settings</source>
+        <translation>การตั้งค่าฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>&amp;Clone entry</source>
+        <translation>โคลนรายการ (&amp;C)</translation>
+    </message>
+    <message>
+        <source>&amp;Find</source>
+        <translation>ค้นหา (&amp;F)</translation>
+    </message>
+    <message>
+        <source>Copy &amp;username</source>
+        <translation>คัดลอกชื่อผู้ใช้ (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Copy username to clipboard</source>
+        <translation>คัดลอกชื่อผู้ใช้ไปคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>Cop&amp;y password</source>
+        <translation>คัดลอกรหัสผ่าน (&amp;Y)</translation>
+    </message>
+    <message>
+        <source>Copy password to clipboard</source>
+        <translation>คัดลอกรหัสผ่านไปคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>&amp;Settings</source>
+        <translation>การตั้งค่า (&amp;S)</translation>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>ตัวสร้างรหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>&amp;Perform Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Open URL</source>
+        <translation>เปิด URL (&amp;O)</translation>
+    </message>
+    <message>
+        <source>&amp;Lock databases</source>
+        <translation>ล็อกฐานข้อมูล (&amp;L)</translation>
+    </message>
+    <message>
+        <source>&amp;Title</source>
+        <translation>หัวเรื่อง (&amp;T)</translation>
+    </message>
+    <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;URL</source>
+        <translation>URL (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Notes</source>
+        <translation>บันทึก (&amp;N)</translation>
+    </message>
+    <message>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Export to CSV file...</source>
+        <translation>ส่งออกไปเป็นแฟ้ม CSV... (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Import KeePass 1 database...</source>
+        <translation>นำเข้าฐานข้อมูล KeePass1...</translation>
+    </message>
+    <message>
+        <source>Import CSV file...</source>
+        <translation>นำเข้าแฟ้ม CSV...</translation>
+    </message>
+    <message>
+        <source>Re&amp;pair database...</source>
+        <translation>ซ่อมฐานข้อมูล... (&amp;P)</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>แสดง TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>ติดตั้ง TOTP...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>คัดลอก &amp;TOTP</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>ล้างประวัติ</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>มีข้อผิดพลาดในการเข้าถึงแฟ้มตั้งค่า %1</translation>
+    </message>
+    <message>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>read-only</source>
+        <translation>อ่านอย่างเดียว</translation>
+    </message>
+    <message>
+        <source>Settings</source>
+        <translation>ตั้งค่า</translation>
+    </message>
+    <message>
+        <source>Toggle window</source>
+        <translation>สลับหน้าต่าง</translation>
+    </message>
+    <message>
+        <source>Quit KeePassXC</source>
+        <translation>ออกจาก KeePassXC</translation>
+    </message>
+    <message>
+        <source>KeePass 2 Database</source>
+        <translation>ฐานข้อมูล KeePass 2</translation>
+    </message>
+    <message>
+        <source>All files</source>
+        <translation>ทุกแฟ้ม</translation>
+    </message>
+    <message>
+        <source>Open database</source>
+        <translation>เปิดฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Save repaired database</source>
+        <translation>บันทึกฐานข้อมูลที่ซ่อมแล้ว</translation>
+    </message>
+    <message>
+        <source>Writing the database failed.</source>
+        <translation>การเขียนฐานข้อมูลล้มเหลว</translation>
+    </message>
+    <message>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>กรุณาแตะปุ่มบน YubiKey ของคุณ!</translation>
+    </message>
+</context>
+<context>
+    <name>OpenSSHKey</name>
+    <message>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeePassHTTP server</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return only best matching entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL schemes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password Generator</source>
+        <translation>ตัวสร้างรหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>ขั้นสูง</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>พอร์ต HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>พอร์ตมาตรฐาน: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PasswordGeneratorWidget</name>
+    <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>รหัสผ่าน:</translation>
+    </message>
+    <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>ความแข็งแรง</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>เอนโทรปี</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Character Types</source>
+        <translation>ชนิดอักขระ</translation>
+    </message>
+    <message>
+        <source>Upper Case Letters</source>
+        <translation>อักษรตัวพิมพ์ใหญ่</translation>
+    </message>
+    <message>
+        <source>Lower Case Letters</source>
+        <translation>อักษรตัวพิมพ์เล็ก</translation>
+    </message>
+    <message>
+        <source>Numbers</source>
+        <translation>ตัวเลข</translation>
+    </message>
+    <message>
+        <source>Special Characters</source>
+        <translation>อักขระพิเศษ</translation>
+    </message>
+    <message>
+        <source>Extended ASCII</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Exclude look-alike characters</source>
+        <translation>ไม่ใช้อักขระที่หน้าตาคล้ายกัน</translation>
+    </message>
+    <message>
+        <source>Pick characters from every group</source>
+        <translation>เลือกใช้ตัวอักขระจากทุกกลุ่ม</translation>
+    </message>
+    <message>
+        <source>&amp;Length:</source>
+        <translation>ความยาว (&amp;L):</translation>
+    </message>
+    <message>
+        <source>Passphrase</source>
+        <translation>วลีรหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Wordlist:</source>
+        <translation>รายการคำ:</translation>
+    </message>
+    <message>
+        <source>Word Count:</source>
+        <translation>จำนวนคำ:</translation>
+    </message>
+    <message>
+        <source>Word Separator:</source>
+        <translation>ตัวแบ่งคำ:</translation>
+    </message>
+    <message>
+        <source>Generate</source>
+        <translation>สร้าง</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>คัดลอก</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>ตกลง</translation>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>ปิด</translation>
+    </message>
+    <message>
+        <source>Apply</source>
+        <translation>ใช้</translation>
+    </message>
+    <message>
+        <source>Entropy: %1 bit</source>
+        <translation>เอนโทรปี: %1 บิต</translation>
+    </message>
+    <message>
+        <source>Password Quality: %1</source>
+        <translation>คุณภาพรหัสผ่าน: %1</translation>
+    </message>
+    <message>
+        <source>Poor</source>
+        <comment>Password quality</comment>
+        <translation>แย่</translation>
+    </message>
+    <message>
+        <source>Weak</source>
+        <comment>Password quality</comment>
+        <translation>อ่อนแอ</translation>
+    </message>
+    <message>
+        <source>Good</source>
+        <comment>Password quality</comment>
+        <translation>ดี</translation>
+    </message>
+    <message>
+        <source>Excellent</source>
+        <comment>Password quality</comment>
+        <translation>ดีมาก</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>สกัดและพิมพ์เนื้อหาของฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>path ของฐานข้อมูลที่จะสกัดเนื้อหา</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>ชื่อของคำสั่งที่จะดำเนินการ</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>แจงรายการฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>ผสานสองฐานข้อมูล</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>ชื่อของรายการที่จะแสดง</translation>
+    </message>
+    <message>
+        <source>NULL device</source>
+        <translation>อุปกรณ์ NULL</translation>
+    </message>
+    <message>
+        <source>error reading from device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>file empty !
+</source>
+        <translation>แฟ้มว่างเปล่า!
+</translation>
+    </message>
+    <message>
+        <source>malformed string</source>
+        <translation>รูปแบบสตริงไม่ถูกต้อง</translation>
+    </message>
+    <message>
+        <source>missing closing quote</source>
+        <translation>ไม่มีเครื่องหมายคำพูดปิด</translation>
+    </message>
+    <message>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Group</source>
+        <translation>กลุ่ม</translation>
+    </message>
+    <message>
+        <source>Title</source>
+        <translation>หัวเรื่อง</translation>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>ชื่อผู้ใช้</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>รหัสผ่าน</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>บันทึก</translation>
+    </message>
+    <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>การทำงานร่วมกับเบราว์เซอร์</translation>
+    </message>
+    <message>
+        <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Press</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Passive</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor</name>
+    <message>
+        <source>Internal zlib error when compressing: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error writing to underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error opening underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Error reading data from underlying device: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error when decompressing: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QtIOCompressor::open</name>
+    <message>
+        <source>The gzip format not supported in this version of zlib.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Internal zlib error: </source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SearchWidget</name>
+    <message>
+        <source>Search...</source>
+        <translation>ค้นหา...</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>ค้นหา</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>ล้าง</translation>
+    </message>
+    <message>
+        <source>Case Sensitive</source>
+        <translation>คำนึงถึงอักษรตัวใหญ่เล็ก</translation>
+    </message>
+    <message>
+        <source>Limit search to selected group</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Service</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: เขียนทับกุญแจที่มีอยู่เดิม?</translation>
+    </message>
+    <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: ปรับปรุงรายการ</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: ฐานข้อมูลล็อกอยู่!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: เอากุญแจออกจากฐานข้อมูล</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: ไม่พบกุญแจ</translation>
+    </message>
+    <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: ไม่มีการตั้งค่าที่ใช้ได้!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>หยุด</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: การอนุญาตถูกนำออก</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SettingsWidget</name>
+    <message>
+        <source>Application Settings</source>
+        <translation>การตั้งค่าแอป</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>ทั่วไป</translation>
+    </message>
+    <message>
+        <source>Security</source>
+        <translation>ความมั่นคง</translation>
+    </message>
+    <message>
+        <source>Access error for config file %1</source>
+        <translation>มีข้อผิดพลาดในการเข้าถึงแฟ้มตั้งค่า %1</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetGeneral</name>
+    <message>
+        <source>Basic Settings</source>
+        <translation>การตั้งค่าพื้นฐาน</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember last databases</source>
+        <translation>จำฐานข้อมูลล่าสุด</translation>
+    </message>
+    <message>
+        <source>Remember last key files and security dongles</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically save on exit</source>
+        <translation>บันทึกอัตโนมัติตอนออก</translation>
+    </message>
+    <message>
+        <source>Automatically save after every change</source>
+        <translation>บันทึกอัตโนมัติทุกครั้งที่มีการเปลี่ยนแปลง</translation>
+    </message>
+    <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Minimize when copying to clipboard</source>
+        <translation>ย่อหน้าต่างเมื่อคัดลอกไปยังคลิปบอร์ด</translation>
+    </message>
+    <message>
+        <source>Minimize window at application startup</source>
+        <translation>ย่อหน้าต่างลงเล็กสุดตอนเริ่มแอป</translation>
+    </message>
+    <message>
+        <source>Use group icon on entry creation</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a system tray icon</source>
+        <translation>แสดงไอคอนสำหรับ system tray</translation>
+    </message>
+    <message>
+        <source>Hide window to system tray when minimized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide window to system tray instead of app exit</source>
+        <translation>ซ่อนหน้าต่างไว้ที่ system tray แทนการออกจากแอป</translation>
+    </message>
+    <message>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Language</source>
+        <translation>ภาษา</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Auto-Type</translation>
+    </message>
+    <message>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Always ask before performing Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-Type delay</source>
+        <translation>การหน่วง Auto-Type</translation>
+    </message>
+    <message>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>มิลลิวิ</translation>
+    </message>
+</context>
+<context>
+    <name>SettingsWidgetSecurity</name>
+    <message>
+        <source>Timeouts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear clipboard after</source>
+        <translation>ล้างคลิปบอร์ดหลัง</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>วิ</translation>
+    </message>
+    <message>
+        <source>Lock databases after inactivity of</source>
+        <translation>ล็อกฐานข้อมูลหลังไม่มีการใช้งาน</translation>
+    </message>
+    <message>
+        <source>Convenience</source>
+        <translation>ความสะดวก</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Lock databases after minimizing the window</source>
+        <translation>ล็อกฐานข้อมูลหลังย่อหน้าต่างลงเล็กสุด</translation>
+    </message>
+    <message>
+        <source>Don&apos;t require password repeat when it is visible</source>
+        <translation>ไม่ต้องถามรหัสผ่านซ้ำถ้ามองเห็นรหัสผ่านอยู่</translation>
+    </message>
+    <message>
+        <source>Show passwords in cleartext by default</source>
+        <translation>แสดงรหัสผ่านอย่างเปิดเผยโดยปริยาย</translation>
+    </message>
+    <message>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Privacy</source>
+        <translation>ความเป็นส่วนตัว</translation>
+    </message>
+    <message>
+        <source>Use Google as fallback for downloading website icons</source>
+        <translation>ใช้กูเกิลเป็นวิธีสำรองเพื่อดาวน์โหลดไอคอนเว็บไซต์</translation>
+    </message>
+</context>
+<context>
+    <name>SetupTotpDialog</name>
+    <message>
+        <source>Setup TOTP</source>
+        <translation>ติดตั้ง TOTP</translation>
+    </message>
+    <message>
+        <source>Key:</source>
+        <translation>กุญแจ:</translation>
+    </message>
+    <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use custom settings</source>
+        <translation>ใช้การตั้งค่าที่กำหนดเอง</translation>
+    </message>
+    <message>
+        <source>Note: Change these settings only if you know what you are doing.</source>
+        <translation>หมายเหตุ: เปลี่ยนแปลงการตั้งค่าเหล่านี้ก็ต่อเมื่อคุณรู้ว่าคุณกำลังทำอะไรอยู่</translation>
+    </message>
+    <message>
+        <source>Time step:</source>
+        <translation>ขั้นเวลา:</translation>
+    </message>
+    <message>
+        <source>8 digits</source>
+        <translation>8 หลัก</translation>
+    </message>
+    <message>
+        <source>6 digits</source>
+        <translation>6 หลัก</translation>
+    </message>
+    <message>
+        <source>Code size:</source>
+        <translation>ขนาดรหัส:</translation>
+    </message>
+    <message>
+        <source> sec</source>
+        <comment>Seconds</comment>
+        <translation>วิ</translation>
+    </message>
+</context>
+<context>
+    <name>TotpDialog</name>
+    <message>
+        <source>Timed Password</source>
+        <translation>รหัสผ่านกำหนดเวลา</translation>
+    </message>
+    <message>
+        <source>000000</source>
+        <translation>000000</translation>
+    </message>
+    <message>
+        <source>Copy</source>
+        <translation>คัดลอก</translation>
+    </message>
+    <message>
+        <source>Expires in</source>
+        <translation>หมดอายุใน</translation>
+    </message>
+    <message>
+        <source>seconds</source>
+        <translation>วินาที</translation>
+    </message>
+</context>
+<context>
+    <name>UnlockDatabaseWidget</name>
+    <message>
+        <source>Unlock database</source>
+        <translation>ปลดล็อกฐานข้อมูล</translation>
+    </message>
+</context>
+<context>
+    <name>WelcomeWidget</name>
+    <message>
+        <source>Welcome to KeePassXC</source>
+        <translation>ยินดีต้อนรับสู่ KeePassXC</translation>
+    </message>
+    <message>
+        <source>Start storing your passwords securely in a KeePassXC database</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Create new database</source>
+        <translation>สร้างฐานข้อมูลใหม่</translation>
+    </message>
+    <message>
+        <source>Open existing database</source>
+        <translation>เปิดฐานข้อมูลที่มีอยู่</translation>
+    </message>
+    <message>
+        <source>Import from KeePass 1</source>
+        <translation>นำเข้าจาก KeePass 1</translation>
+    </message>
+    <message>
+        <source>Import from CSV</source>
+        <translation>นำเข้าจาก CSV</translation>
+    </message>
+    <message>
+        <source>Recent databases</source>
+        <translation>ฐานข้อมูลที่เพิ่งใช้</translation>
+    </message>
+</context>
+<context>
+    <name>main</name>
+    <message>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - แอปจัดการรหัสผ่านข้ามแพลตฟอร์ม</translation>
+    </message>
+    <message>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path to a custom config file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>key file of the database</source>
+        <translation>แฟ้มกุญแจสำหรับฐานข้อมูลดังกล่าว</translation>
+    </message>
+    <message>
+        <source>read password of the database from stdin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_tr.ts b/share/translations/keepassx_tr.ts
index 4514a4204..7dc4d409f 100644
--- a/share/translations/keepassx_tr.ts
+++ b/share/translations/keepassx_tr.ts
@@ -10,14 +10,34 @@
         <translation>Hakkında</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Hataları bildir: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC GNU Genel Kamu Lisansı (GPL) sürüm 2 veya (isteğinize göre) sürüm 3 şartları altında dağıtılmıştır.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Tasarı Bakımcıları:</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Katkıcılar</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Katkıları GitHub&apos;da Gör&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Hata Ayıklama Bilgisi</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Bir hata bildirirken şu bilgileri ekleyin:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Panoya kopyala</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Düzeltme: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>Dağıtım: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Kütüphaneler:</translation>
     </message>
@@ -47,34 +71,14 @@ MİB mimarisi: %2
         <source>Enabled extensions:</source>
         <translation>Etkin eklentiler:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Hataları bildir: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC GNU Genel Kamu Lisansı (GPL) sürüm 2 veya (isteğinize göre) sürüm 3 şartları altında dağıtılmıştır.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Tasarı Bakımcıları:</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Katkıları GitHub&apos;da Gör&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Bir hata bildirirken şu bilgileri ekleyin:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP Erişim Onayı</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Bu kararı anımsa</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1, şu öge(ler) için parolalara erişim izni istedi.
 Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP Erişim Onayı</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -105,7 +112,27 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
     <message>
         <source>Auto-Type - KeePassXC</source>
-        <translation>Oto-Yaz - KeePassXC</translation>
+        <translation>Oto-Yazım - KeePassXC</translation>
+    </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Oto-Yazım</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -126,12 +153,289 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Oto-Yazım - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
-        <translation>Oto-Yazmak için girdi seçiniz:</translation>
+        <translation>Oto-Yazım için girdi seçiniz:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Oto-Yaz - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>Bu kararı anımsa</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>İzin ver</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Reddet</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1, şu öge(ler) için parolalara erişim izni istedi.
+Lütfen erişime izin vermek istediklerinizi seçin.</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diyalog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Genel</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Eğer kilitliyse veri tabanını açmayı is&amp;te</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Tüm alan adı için tüm girdilerin yerine belirli bir URL için yalnızca en iyi eşleşmeyi döndürür.</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Gelişmiş</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Yalnızca seçilen veri tabanı istemciyle bağlanmış olmalıdır.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Dizge alanlarını kendiliğinden oluşturma ve güncelleme desteklenmiyor.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&quot;KPH: &quot; ile başlayan gelişmiş dizge alanları &amp;döndür</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Yeni anahtar ilişkilendirme isteği</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Var olan anahtarın üstüne yaz?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Girdi Güncelle</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Veri tabanı kilitli!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Etkin veri tabanı kilitli!
+Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birini seçin.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Ayarlar kullanılabilir değil!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Anahtar bulunamadı</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Anahtarlar veri tabanından kaldırıldı</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: Silinen yetkiler</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: İzinli girdi bulunamadı!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Etkin veri tabanı izinleri olan girdi barındırmıyor.</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Parolayı yinele:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>&amp;Anahtar dosyası</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Gözat</translation>
     </message>
@@ -157,6 +465,14 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Oluştur</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Yenile</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Anahtar dosyaları</translation>
     </message>
@@ -177,6 +493,10 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Bir anahtar dosyası seç</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Boş parola</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Boş bir dizgeyi parola olarak kullanmak istediğinize emin misiniz?</translation>
     </message>
@@ -191,20 +511,15 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>&amp;Anahtar dosyası</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
+        <source>Legacy key file format</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Refresh</source>
-        <translation>Yenile</translation>
-    </message>
-    <message>
-        <source>Empty password</source>
-        <translation>Boş parola</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Klonlama Ayarları</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Başlık sonuna &apos; - Klon&apos; ekle</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation type="unfinished"/>
     </message>
@@ -225,10 +544,6 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <source>Copy history</source>
         <translation>Kopyalama Geçmişi</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Başlık sonuna &apos; - Klon&apos; ekle</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -270,7 +585,7 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
     </message>
     <message>
         <source>Number of headers line to discard</source>
-        <translation>Kaldırılacak başlık satırı adedi</translation>
+        <translation>Vazgeçilecek başlık satırı adedi</translation>
     </message>
     <message>
         <source>Consider &apos;\&apos; an escape character</source>
@@ -326,10 +641,6 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>CSV dosyası içe aktar</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Hata</translation>
     </message>
@@ -340,17 +651,17 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>bayt,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>satır,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>sütun,</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Gözat</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Yenile</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Veri tabanı açılamıyor.</translation>
     </message>
@@ -380,6 +699,21 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Anahtar dosya açılamıyor</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Tüm dosyalar</translation>
     </message>
@@ -391,14 +725,6 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <source>Select key file</source>
         <translation>Anahtar dosyası seç</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Yenile</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Lütfen erişime izin vermek istediklerinizi seçin.</translation>
         <translation>Anahtar dosya açılamıyor</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Veri tabanı açıldı. Yapılacak bir şey yok.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Veri tabanı açılamıyor.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Veri tabanı açıldı. Yapılacak bir şey yok.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Başarılı</translation>
     </message>
@@ -440,40 +766,57 @@ Artık kaydedebilirsiniz.</translation>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Veri tabanı adı:</translation>
+        <source>General</source>
+        <translation>Genel</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Veri tabanı ayrıntısı:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Öntanımlı kullanıcı adı:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Karşılaştırmalı Değerlendirme</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Azami geçmiş ögesi:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Azami geçmiş boyutu:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Geri dönüşüm kutusunu kullan</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ Artık kaydedebilirsiniz.</translation>
         <translation>Twofish:  256 Bit</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Algoritma:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Veri tabanı adı:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Veri tabanı ayrıntısı:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Öntanımlı kullanıcı adı:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Azami geçmiş ögesi:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Azami geçmiş boyutu:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Geri dönüşüm kutusunu kullan</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Kök</translation>
     </message>
     <message>
@@ -504,29 +911,55 @@ Artık kaydedebilirsiniz.</translation>
     </message>
     <message>
         <source>Open database</source>
-        <translation>Veritabanı aç</translation>
+        <translation>Veri tabanı aç</translation>
     </message>
     <message>
         <source>File not found!</source>
         <translation>Dosya bulunamadı!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>KeePass 1 veri tabanı aç</translation>
+        <source>Unable to open the database.</source>
+        <translation>Veri tabanı açılamıyor.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 veri tabanı</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Dosya salt okunur kipte açıldı.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>CSV dosyası aç</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV dosyası</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Tüm dosyalar (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Veri tabanı birleştir</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>KeePass 1 veri tabanı aç</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 veri tabanı</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Kapat?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>&quot;%1&quot;, düzenleme kipinde.
+Değişikliklerden vazgeç ve her durumda kapat?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Değişiklikleri kaydet?</translation>
     </message>
@@ -541,10 +974,22 @@ Değişiklikleri kaydet?</translation>
         <translation>Veri tabanına yazma başarısız.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Parolalar</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Veri tabanını farklı kaydet</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Veri tabanını CSV dosyasına dışa aktar</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>CSV dosyasına yazma başarısız.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Yeni veri tabanı</translation>
     </message>
@@ -563,11 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Lütfen değişikliklerinizi bitirmek için iptale basın veya onlardan vazgeçin.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -575,172 +1015,200 @@ Otherwise your changes are lost.</source>
 Kilitlemeden önce veri tabanını kaydetmek ister misiniz?
 Aksi halde değişiklikleriniz kaybolacak.</translation>
     </message>
+</context>
+<context>
+    <name>DatabaseWidget</name>
     <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation type="unfinished"/>
+        <source>Searching...</source>
+        <translation>Aranıyor...</translation>
     </message>
     <message>
-        <source>Export database to CSV file</source>
-        <translation>Veri tabanını CSV dosyasına dışa aktar</translation>
+        <source>Change master key</source>
+        <translation>Ana anahtarı değiştir</translation>
     </message>
     <message>
-        <source>CSV file</source>
-        <translation>CSV dosyası</translation>
+        <source>Delete entry?</source>
+        <translation>Girdiyi sil?</translation>
     </message>
     <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>CSV dosyasına yazma başarısız.</translation>
+        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <translation>&quot;%1&quot; girdisini tümüyle silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <source>Unable to open the database.</source>
-        <translation>Veri tabanı açılamıyor.</translation>
+        <source>Delete entries?</source>
+        <translation>Girdileri sil?</translation>
     </message>
     <message>
-        <source>Merge database</source>
-        <translation>Veri tabanı birleştir</translation>
+        <source>Do you really want to delete %1 entries for good?</source>
+        <translation>%1 girdiyi tümüyle silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation type="unfinished"/>
+        <source>Move entry to recycle bin?</source>
+        <translation>Girdiyi geri dönüşüm kutusuna taşı?</translation>
     </message>
     <message>
-        <source>Passwords</source>
-        <translation>Parolalar</translation>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>&quot;%1&quot; girdisini geri dönüşüm kutusuna taşımak istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <source>Database already opened</source>
-        <translation>Veri tabanı zaten açıldı</translation>
+        <source>Move entries to recycle bin?</source>
+        <translation>Girdileri geri dönüşüm kutusuna taşı?</translation>
+    </message>
+    <message numerus="yes">
+        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation type="unfinished"/>
+        <source>Execute command?</source>
+        <translation>Komut çalıştır?</translation>
     </message>
     <message>
-        <source>Open read-only</source>
-        <translation>Salt okunur aç</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Şu komutu çalıştırmak istediğinize emin misiniz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>File opened in read only mode.</source>
-        <translation>Dosya salt okunur kipte açıldı.</translation>
+        <source>Remember my choice</source>
+        <translation>Seçimimi anımsa</translation>
     </message>
     <message>
-        <source>Open CSV file</source>
-        <translation>CSV dosyası aç</translation>
+        <source>Delete group?</source>
+        <translation>Kümeyi sil?</translation>
     </message>
-</context>
-<context>
-    <name>DatabaseWidget</name>
     <message>
-        <source>Change master key</source>
-        <translation>Ana anahtarı değiştir</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>&quot;%1&quot; kümesini tümüyle silmek istediğinize emin misiniz?</translation>
     </message>
     <message>
-        <source>Delete entry?</source>
-        <translation>Girdiyi sil?</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Ana anahtar hesaplanamıyor</translation>
     </message>
     <message>
-        <source>Do you really want to delete the entry &quot;%1&quot; for good?</source>
+        <source>No current database.</source>
+        <translation>Geçerli veri tabanı yok.</translation>
+    </message>
+    <message>
+        <source>No source database, nothing to do.</source>
+        <translation>Kaynak veri tabanı yok, yapılacak bir şey yok.</translation>
+    </message>
+    <message>
+        <source>Search Results (%1)</source>
+        <translation>Arama Sonuçları (%1)</translation>
+    </message>
+    <message>
+        <source>No Results</source>
+        <translation>Sonuç Yok</translation>
+    </message>
+    <message>
+        <source>File has changed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Delete entries?</source>
-        <translation>Girdileri sil?</translation>
+        <source>The database file has changed. Do you want to load the changes?</source>
+        <translation>Veri tabanı dosyası değiştirildi. Değişiklikleri yüklemek ister misiniz?</translation>
     </message>
     <message>
-        <source>Do you really want to delete %1 entries for good?</source>
+        <source>Merge Request</source>
+        <translation>Birleştirme İsteği</translation>
+    </message>
+    <message>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Move entries to recycle bin?</source>
-        <translation>Girdileri geri dönüşüm kutusuna taşı?</translation>
+        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <translation>Bu veri tabanını kendiliğinden yeniden yüklenirken yeni veri tabanı dosyası açılamadı.</translation>
     </message>
-    <message numerus="yes">
-        <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    <message>
+        <source>Empty recycle bin?</source>
+        <translation>Geri dönüşüm kutusunu boşalt?</translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Kümeyi sil?</translation>
+        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
+        <translation>Geri dönüşüm kutunuzdaki her şeyi kalıcı olarak silmek istediğinize emin misiniz?</translation>
     </message>
+</context>
+<context>
+    <name>DetailsWidget</name>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <source>Generate TOTP Token</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ana anahtar hesaplanamıyor</translation>
+        <source>Close</source>
+        <translation>Kapat</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Girdiyi geri dönüşüm kutusuna taşı?</translation>
+        <source>General</source>
+        <translation>Genel</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>&quot;%1&quot; girdisini geri dönüşüm kutusuna taşımak istediğinize emin misiniz?</translation>
+        <source>Password</source>
+        <translation>Parola</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Aranıyor...</translation>
+        <source>URL</source>
+        <translation>URL</translation>
     </message>
     <message>
-        <source>No current database.</source>
-        <translation>Geçerli veri tabanı yok.</translation>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No source database, nothing to do.</source>
-        <translation>Kaynak veri tabanı yok, yapılacak bir şey yok.</translation>
+        <source>Username</source>
+        <translation>Kullanıcı adı</translation>
     </message>
     <message>
-        <source>Search Results (%1)</source>
-        <translation>Arama Sonuçları (%1)</translation>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>No Results</source>
-        <translation>Sonuç Yok</translation>
+        <source>Searching</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Komut çalıştır?</translation>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Şu komutu çalıştırmak istediğinize emin misiniz?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
+        <source>Attachments</source>
+        <translation>Ekler</translation>
     </message>
     <message>
-        <source>Remember my choice</source>
-        <translation>Seçimimi anımsa</translation>
+        <source>Notes</source>
+        <translation>Notlar</translation>
     </message>
     <message>
-        <source>Autoreload Request</source>
-        <translation>Kendinden yeniden yükleme isteği</translation>
+        <source>Window</source>
+        <translation>Pencere</translation>
     </message>
     <message>
-        <source>The database file has changed. Do you want to load the changes?</source>
-        <translation>Veri tabanı dosyası değiştirildi. Değişiklikleri yüklemek ister misiniz?</translation>
+        <source>Sequence</source>
+        <translation>Sıra</translation>
     </message>
     <message>
-        <source>Merge Request</source>
-        <translation>Birleştirme İsteği</translation>
+        <source>Search</source>
+        <translation>Ara</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Veri tabanı dosyası değiştirildi ve kaydedilmemiş değişiklikleriniz var. Değişikliklerinizi birleştirmek ister misiniz?</translation>
+        <source>Clear</source>
+        <translation>Temizle</translation>
     </message>
     <message>
-        <source>Could not open the new database file while attempting to autoreload this database.</source>
+        <source>Never</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty recycle bin?</source>
-        <translation>Geri dönüşüm kutusunu boşalt?</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Are you sure you want to permanently delete everything from your recycle bin?</source>
-        <translation>Geri dönüşüm kutunuzdaki her şeyi kalıcı olarak silmek istediğinize emin misiniz?</translation>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -759,7 +1227,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazma</translation>
+        <translation>Oto-Yazım</translation>
     </message>
     <message>
         <source>Properties</source>
@@ -770,6 +1238,30 @@ Do you want to open it anyway?</source>
         <translation>Geçmiş</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Girdi geçmişi</translation>
     </message>
@@ -779,7 +1271,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Edit entry</source>
-        <translation>Girdi düzenle</translation>
+        <translation>Girdiyi düzenle</translation>
     </message>
     <message>
         <source>Different passwords supplied.</source>
@@ -790,22 +1282,20 @@ Do you want to open it anyway?</source>
         <translation>Yeni öznitelik</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Dosya seç</translation>
+        <source>Confirm Remove</source>
+        <translation>Kaldırmayı Onayla</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Dosya açılamıyor</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Bu özniteliği silmek istediğinizden emin misiniz?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Eki kaydet</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Ek kaydedilemiyor:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -813,32 +1303,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n hafta</numerusform><numerusform>%n hafta</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n ay</numerusform><numerusform>%n ay</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 yıl</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Kaldırmayı Onayla</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Bu özniteliği silmek istediğinizden emin misiniz?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[KORUMALI] Görmek veya düzenlemek için göstere bas</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Bu eki kaldırmak istediğinizden emin misiniz?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -855,18 +1329,6 @@ Do you want to open it anyway?</source>
         <translation>Kaldır</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Ekler</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Kaydet</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Aç</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Adı Düzenle</translation>
     </message>
@@ -878,12 +1340,28 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>Göster</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Ekler</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
     <message>
         <source>Enable Auto-Type for this entry</source>
-        <translation type="unfinished"/>
+        <translation>Bu girdi için Oto-Yazımı etkinleştir</translation>
+    </message>
+    <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Öntanımlı Oto-Yazım dizilişini &amp;kümeden devral</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Özel Oto-Yazım dizilişi k&amp;ullan:</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Pencere İlişkilendirmeleri</translation>
     </message>
     <message>
         <source>+</source>
@@ -898,24 +1376,12 @@ Do you want to open it anyway?</source>
         <translation>Pencere başlığı:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
-        <translation type="unfinished"/>
+        <translation>Öntanımlı &amp;dizilişi kullan</translation>
     </message>
     <message>
         <source>Set custo&amp;m sequence:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Window Associations</source>
-        <translation type="unfinished"/>
+        <translation>Öze&amp;l diziliş belirle:</translation>
     </message>
 </context>
 <context>
@@ -926,7 +1392,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Restore</source>
-        <translation type="unfinished"/>
+        <translation>Geri yükle</translation>
     </message>
     <message>
         <source>Delete</source>
@@ -940,36 +1406,116 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
+        <source>URL:</source>
+        <translation>URL:</translation>
+    </message>
+    <message>
+        <source>Password:</source>
+        <translation>Parola:</translation>
+    </message>
+    <message>
+        <source>Repeat:</source>
+        <translation>Yinele:</translation>
+    </message>
+    <message>
         <source>Title:</source>
         <translation>Başlık:</translation>
     </message>
     <message>
+        <source>Notes</source>
+        <translation>Notlar</translation>
+    </message>
+    <message>
+        <source>Presets</source>
+        <translation>Öndeğerler</translation>
+    </message>
+    <message>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Username:</source>
         <translation>Kullanıcı adı:</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Parola:</translation>
+        <source>Expires</source>
+        <translation>Biter</translation>
     </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
     <message>
-        <source>Repeat:</source>
-        <translation>Yinele:</translation>
+        <source>Form</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Expires</source>
+        <source> seconds</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Presets</source>
+        <source>Fingerprint</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Notlar</translation>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Panoya kopyala</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -992,7 +1538,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Edit group</source>
-        <translation>Küme düzenle</translation>
+        <translation>Kümeyi düzenle</translation>
     </message>
     <message>
         <source>Enable</source>
@@ -1004,7 +1550,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Inherit from parent group (%1)</source>
-        <translation type="unfinished"/>
+        <translation>Üst kümeden devral (%1)</translation>
     </message>
 </context>
 <context>
@@ -1019,28 +1565,36 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Expires</source>
-        <translation type="unfinished"/>
+        <translation>Biter</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation>Arama</translation>
+        <translation>Ara</translation>
     </message>
     <message>
         <source>Auto-Type</source>
-        <translation>Oto-Yazma</translation>
+        <translation>Oto-Yazım</translation>
     </message>
     <message>
         <source>&amp;Use default Auto-Type sequence of parent group</source>
-        <translation type="unfinished"/>
+        <translation>Üst kümenin öntanımlı Oto-Yazım dizilişini k&amp;ullan</translation>
     </message>
     <message>
         <source>Set default Auto-Type se&amp;quence</source>
-        <translation type="unfinished"/>
+        <translation>Öntanımlı Oto-Yazım &amp;dizilişi belirle</translation>
     </message>
 </context>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>&amp;Öntanımlı simge kullan</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Öze&amp;l simge kullan</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Özel simge ekle</translation>
     </message>
@@ -1049,6 +1603,18 @@ Do you want to open it anyway?</source>
         <translation>Özel simgeyi sil</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Simge indir</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Simge alınamadı.</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>İpucu: Araçlar&gt;Ayarlar&gt;Güvenlik altından Google&apos;ı yedek olarak etkinleştirebilirsiniz</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Resimler</translation>
     </message>
@@ -1061,24 +1627,12 @@ Do you want to open it anyway?</source>
         <translation>Resim Seç</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Simge indir</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Simge alınamadı.</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Simge okunamadı</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>&amp;Öntanımlı simgeyi kullan</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Öze&amp;l simge kullan</translation>
+        <source>Custom icon already exists</source>
+        <translation>Özel simge zaten var</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1088,14 +1642,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Bu simge %1 girdi tarafından kullanılıyor ve öntanımlı simge tarafından değiştirilecek. Silmek istediğinize emin misiniz?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1120,10 +1666,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- Klon</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Ad</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Ekle</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Kaldır</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Aç</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Kaydet</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Kaldırmayı Onayla</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1152,6 +1782,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Ref: </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Küme</translation>
     </message>
@@ -1167,11 +1802,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Ref: </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1181,6 +1811,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1208,7 +1849,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Numbers</source>
-        <translation>Sayılar</translation>
+        <translation>Rakamlar</translation>
     </message>
     <message>
         <source>0-9</source>
@@ -1228,7 +1869,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Ensure that the password contains characters from every group</source>
-        <translation>Parolanın her kümeden karakter içerdiğine emin olun</translation>
+        <translation>Parolanın her kümeden karakter içerdiğine emin ol</translation>
     </message>
 </context>
 <context>
@@ -1243,6 +1884,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Ana anahtar hesaplanamıyor</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Yanlış anahtar veya veri tabanı dosyası bozuk.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Ana anahtar hesaplanamıyor</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Ana anahtar hesaplanamıyor</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Ana anahtar hesaplanamıyor</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>KeePass veri tabanı değil.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Seçilen dosya eski bir KeePass1 veri tabanıdır (.kdb).
+
+Veri tabanı &gt; &apos;KeePass1 veri tabanı içe aktar...&apos;a tıklayarak içe aktarabilirsiniz.
+Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski KeePassX 0.4 sürümüyle açamayacaksınız.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1272,140 +2268,181 @@ Do you want to open it anyway?</source>
         <translation>Desteklenmeyen KeePass veri tabanı sürümü.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Kök</translation>
     </message>
     <message>
         <source>Unable to calculate master key</source>
-        <translation>Ana anahtar hesaplanamaz</translation>
+        <translation>Ana anahtar hesaplanamıyor</translation>
     </message>
     <message>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Yanlış anahtar veya veri tabanı dosyası bozuk.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>KeePass veri tabanı değil.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Desteklenmeyen KeePass veri tabanı sürümü.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Yanlış anahtar veya veri tabanı dosyası bozuk.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ana anahtar hesaplanamaz</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Seçilen dosya eski bir KeePass1 veri tabanıdır (.kdb).
-
-Veri tabanı &gt; &apos;KeePass1 veri tabanı içe aktar...&apos;a tıklayarak içe aktarabilirsiniz.
-Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski KeePassX 0.4 sürümüyle açamayacaksınız.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Ana anahtar hesaplanamıyor</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Kriptografik işlevler sınanırken ölümcül hata.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - Hata</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <source>Incorrect group level field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Başka bir KeePassXC oluşumu zaten çalışıyor.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Veritabanı aç</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Veri tabnı ayarları</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Kullanıcı adını panoya kopyala</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Parolayı panoya kopyala</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ayarlar</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Araç çubuğunu göster</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>salt okunur</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
+        <source>Invalid entry modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 Veri Tabanı</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Tüm dosyalar</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Main</name>
+    <message>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>Var olan tekil oluşum kilit dosyası geçersiz. Yeni oluşum başlatılıyor.</translation>
     </message>
     <message>
-        <source>Save repaired database</source>
-        <translation>Onarılan veri tabanını kaydet</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Kilit dosyası oluşturulamadı. Tekil oluşum kipi devre dışı bırakıldı.</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Veri tabanına yazma başarısız.</translation>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Başka bir KeePassXC oluşumu zaten çalışıyor.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Kriptografik işlevler sınanırken ölümcül hata.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - Hata</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>&amp;Veri tabanı</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>&amp;Son veri tabanları</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>İçe aktar</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>&amp;Yardım</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>G&amp;irdiler</translation>
     </message>
@@ -1414,12 +2451,16 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
         <translation>Öznite&amp;liği panoya kopyala</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>&amp;Kümeler</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <source>&amp;Tools</source>
+        <translation>&amp;Araçlar</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1430,6 +2471,10 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
         <translation>&amp;Hakkında</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>&amp;Veri tabanı aç...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Veri tabanını k&amp;aydet</translation>
     </message>
@@ -1451,11 +2496,11 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>&amp;View/Edit entry</source>
-        <translation type="unfinished"/>
+        <translation>Girdiyi &amp;göster/düzenle</translation>
     </message>
     <message>
         <source>&amp;Delete entry</source>
-        <translation type="unfinished"/>
+        <translation>Girdiyi &amp;sil</translation>
     </message>
     <message>
         <source>&amp;Add new group</source>
@@ -1463,31 +2508,31 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
     </message>
     <message>
         <source>&amp;Edit group</source>
-        <translation type="unfinished"/>
+        <translation>Kümeyi &amp;düzenle</translation>
     </message>
     <message>
         <source>&amp;Delete group</source>
-        <translation type="unfinished"/>
+        <translation>Kümeyi &amp;sil</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>&amp;Veri tabanı ayarları</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Veri tabanını farklı ka&amp;ydet...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>&amp;Girdi Klonla</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Ana anahtarı değiştir...</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Zamanlanmış tek seferlik parola</translation>
+        <source>&amp;Database settings</source>
+        <translation>&amp;Veri tabanı ayarları</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>&amp;ZTSP&apos;yi kopyala</translation>
+        <source>Database settings</source>
+        <translation>Veri tabnı ayarları</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>ZTSP&apos;yi göster</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Girdiyi &amp;klonla</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1498,20 +2543,32 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
         <translation>&amp;Kullanıcı adını kopyala</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Kullanıcı adını panoya kopyala</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Parolayı kop&amp;yala</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Parolayı panoya kopyala</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>&amp;Ayarlar</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Parola Oluşturucu</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>Oto-Yazım &amp;gerçekleştir</translation>
     </message>
     <message>
         <source>&amp;Open URL</source>
-        <translation type="unfinished"/>
+        <translation>URL&apos;yi &amp;aç</translation>
     </message>
     <message>
         <source>&amp;Lock databases</source>
@@ -1522,211 +2579,351 @@ Bu tek yönlü bir yer değiştirmedir. İçe aktarılan veri tabanını eski Ke
         <translation>&amp;Başlık</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>&amp;Notlar</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Parola Oluşturucu</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Geçmişi temizle</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>&amp;CSV dosyasına aktar...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>&amp;Veri tabanı</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>KeePass 1 veri tabanını içe aktar</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>İçe aktar</translation>
+        <source>Import CSV file...</source>
+        <translation>CSV dosyasını içe aktar...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>&amp;Araçlar</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Veri tabanını onar...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>ZTSP&apos;yi göster</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>TOTP kurulumu yap...</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
+        <source>Copy &amp;TOTP</source>
+        <translation>&amp;ZTSP&apos;yi kopyala</translation>
+    </message>
+    <message>
+        <source>E&amp;mpty recycle bin</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Clear history</source>
+        <translation>Geçmişi temizle</translation>
+    </message>
+    <message>
         <source>Access error for config file %1</source>
         <translation>%1 yapılandırma dosyası için erişim hatası</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>KeePassXC&apos;den Çık</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Lütfen YubiKey&apos;inizdeki düğmeye dokunun!</translation>
+        <source>read-only</source>
+        <translation>salt okunur</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>&amp;Yardım</translation>
+        <source>Settings</source>
+        <translation>Ayarlar</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>&amp;Veritabanı aç...</translation>
+        <source>Toggle window</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Veribanını kaydet...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>KeePassXC&apos;den Çık</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Ana anahtarı değiştir...</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 Veri Tabanı</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>&amp;CSV dosyasına aktar...</translation>
+        <source>All files</source>
+        <translation>Tüm dosyalar</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>KeePass 1 veritabanını içe aktar</translation>
+        <source>Open database</source>
+        <translation>Veri tabanı aç</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>CSV dosyasını içe aktar...</translation>
+        <source>Save repaired database</source>
+        <translation>Onarılan veri tabanını kaydet</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Veritabanını onar...</translation>
+        <source>Writing the database failed.</source>
+        <translation>Veri tabanına yazma başarısız.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>TOTP kurulumu yap...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Lütfen YubiKey&apos;inizdeki düğmeye dokunun!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Diyalog</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Genel</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
+        <source>Base64 decoding failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <source>Key file way too small.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Gelişmiş</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
+        <source>Found zero keys</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
+        <source>Failed to read public key.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <source>Corrupted key file, reading private key failed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP Bağlantı noktası:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>Öntanımlı bağlantı noktası: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <source>Trying to run KDF without cipher</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
+        <source>Passphrase is required to decrypt this key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC, 127.0.0.1 üzerinde bu bağlantı noktasını dinleyecek.</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
+        <source>Unknown KDF: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
+        <source>Decryption failed, wrong passphrase?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
+        <source>Unexpected EOF while reading public key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <source>Unknown key type: </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
+        <source>Unexpected EOF while reading private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Diyalog</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
+        <translation>Bu, ChromeIPass veya PassIFox&apos;tan veri tabanlarınıza erişirken gereklidir</translation>
+    </message>
+    <message>
         <source>Enable KeePassHTTP server</source>
         <translation>KeePassHTTP sunucusunu etkinleştir</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Genel</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Kimlik bilgisi istendiğinde bildirim g&amp;öster</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
-        <translation type="unfinished"/>
+        <translation>Tüm alan adı için tüm girdilerin yerine belirli bir URL için yalnızca en iyi eşleşmeyi döndürür.</translation>
     </message>
     <message>
         <source>&amp;Return only best matching entries</source>
-        <translation type="unfinished"/>
+        <translation>Yalnızca en iyi eşleşen girdileri &amp;döndür</translation>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Eğer kilitliyse veri tabanını açmayı is&amp;te</translation>
     </message>
     <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
-        <translation type="unfinished"/>
+        <translation>Yalnızca aynı şemalı girdiler (http://, https://, ftp://, ...) döndürülür.</translation>
     </message>
     <message>
         <source>&amp;Match URL schemes</source>
-        <translation type="unfinished"/>
+        <translation>URL şemalarını &amp;eşle</translation>
+    </message>
+    <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Eşleşen girdileri &amp;kullanıcı adına göre sırala</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>&amp;Eşleşen girdileri başlığa göre sırala</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Paylaşılan tüm anahtarları etkin veri tabanından ka&amp;ldır</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Saklanan tüm izinleri etkin veri tabanındaki girdilerden kal&amp;dır</translation>
     </message>
     <message>
         <source>Password Generator</source>
         <translation>Parola Oluşturucu</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Gelişmiş</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Her zaman girdilere &amp;erişime izin ver</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Her zaman girdileri g&amp;üncellemeye izin ver</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
+        <translation>Yalnızca seçilen veri tabanı istemciyle bağlanmış olmalıdır.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Eşleşen girdiler için tüm açık veri tabanlarını a&amp;ra</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Dizge alanlarını kendiliğinden oluşturma ve güncelleme desteklenmiyor.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>&quot;KPH: &quot; ile başlayan gelişmiş dizge alanları &amp;döndür</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP Bağlantı noktası:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>Öntanımlı bağlantı noktası: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC, 127.0.0.1 üzerinde bu bağlantı noktasını dinleyecek.</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Aşağıdaki seçenekler tehlikeli olabilir!
-Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>1024&apos;ün altındaki ayrıcalıklı bağlantı noktalarına bağlanamaz!
+Öntanımlı bağlantı noktası olan 19455 kullanılıyor.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%%p</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Parola:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>güç</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Karakter Türleri</translation>
     </message>
@@ -1740,45 +2937,57 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
     </message>
     <message>
         <source>Numbers</source>
-        <translation>Sayılar</translation>
+        <translation>Rakamlar</translation>
     </message>
     <message>
         <source>Special Characters</source>
         <translation>Özel Karakterler</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Genişletilmiş ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Benzer karakterleri dışla</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Onayla</translation>
+        <source>Pick characters from every group</source>
+        <translation>Her kümeden karakter seç</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%%p</translation>
+        <source>&amp;Length:</source>
+        <translation>&amp;Uzunluk:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>güç</translation>
+        <source>Passphrase</source>
+        <translation>Parola Öbeği</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation type="unfinished"/>
+        <source>Wordlist:</source>
+        <translation>Sözcük listesi:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>&amp;Uzunluk:</translation>
+        <source>Word Count:</source>
+        <translation>Sözcük Sayısı:</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Her kümeden karakter seç</translation>
+        <source>Word Separator:</source>
+        <translation>Sözcük Ayırıcı:</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Oluştur</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Kopyala</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Onayla</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Kapat</translation>
     </message>
@@ -1788,7 +2997,7 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
     </message>
     <message>
         <source>Entropy: %1 bit</source>
-        <translation type="unfinished"/>
+        <translation>Entropi: %1 bit</translation>
     </message>
     <message>
         <source>Password Quality: %1</source>
@@ -1796,51 +3005,270 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Kötü</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Zayıf</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>İyi</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Harika</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Password</source>
-        <translation>Parola</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Genişletilmiş ASCII</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
+        <source>Cannot decrypt message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Sözcük listesi:</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Sözcük Sayısı:</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Sözcük Ayırıcı:</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Kopyala</translation>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Veri tabanının yolu.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Veri tabanının içeriğini çıkar ve yazdır.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Veri tabanının çıkarılacağı yol.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Çalıştırılacak komutun adı.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Veri tabanı girdilerini listele.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Listelenecek kümenin yolu. Öntanımlı: /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>İki veri tabanını birleştir.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Veri tabanının nereye birleştirileceği.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Veri tabanının nereden birleştirileceği.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Gösterilecek girdinin adı.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL aygıtı</translation>
@@ -1857,14 +3285,34 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
     </message>
     <message>
         <source>malformed string</source>
-        <translation type="unfinished"/>
+        <translation>kusurlu dizge</translation>
     </message>
     <message>
         <source>missing closing quote</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1884,18 +3332,26 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
         <translation>Parola</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Notlar</translation>
     </message>
     <message>
-        <source>Browser Integration</source>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browser Integration</source>
+        <translation>Tarayıcı Tümleşmesi</translation>
+    </message>
+    <message>
         <source>YubiKey[%1] Challenge Response - Slot %2 - %3</source>
         <translation type="unfinished"/>
     </message>
@@ -1907,12 +3363,16 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
     <message>
         <source>Internal zlib error when compressing: </source>
-        <translation type="unfinished"/>
+        <translation>Sıkıştırılırken iç zlib hatası:</translation>
     </message>
     <message>
         <source>Error writing to underlying device: </source>
@@ -1928,14 +3388,14 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
     </message>
     <message>
         <source>Internal zlib error when decompressing: </source>
-        <translation type="unfinished"/>
+        <translation>Sıkıştırma açılırken iç zlib hatası:</translation>
     </message>
 </context>
 <context>
     <name>QtIOCompressor::open</name>
     <message>
         <source>The gzip format not supported in this version of zlib.</source>
-        <translation type="unfinished"/>
+        <translation>gzip biçimi zlib&apos;in bu sürümünde desteklenmiyor.</translation>
     </message>
     <message>
         <source>Internal zlib error: </source>
@@ -1945,8 +3405,8 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Büyük Küçük Harfe Duyarlı</translation>
+        <source>Search...</source>
+        <translation>Ara...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1957,99 +3417,103 @@ Yalnızca ne yaptığınızı biliyorsanız onları değiştirin.</translation>
         <translation>Temizle</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Ara...</translation>
+        <source>Case Sensitive</source>
+        <translation>Büyük Küçük Harfe Duyarlı</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
-        <translation type="unfinished"/>
+        <translation>Aramayı seçilen kümeye sınırla</translation>
     </message>
 </context>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: Yeni anahtar ilişkilendirme isteği</translation>
     </message>
     <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation type="unfinished"/>
+        <source>You have received an association request for the above key.
+If you would like to allow it access to your KeePassXC database
+give it a unique name to identify and accept it.</source>
+        <translation>Yukarıdaki anahtar için ilişkilendirme isteği aldınız.
+Eğer KeePassXC veri tabanınıza erişmesine izin vermek isterseniz
+tanımlamak için ona eşsiz bir ad verin ve kabul edin.</translation>
     </message>
     <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: Var olan anahtarın üstüne yaz?</translation>
     </message>
     <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>&quot;%1&quot; adlı bir paylaşılan şifreleme anahtarı zaten var.
+Üzerine yazmak ister misiniz?</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: Girdi Güncelle</translation>
     </message>
     <message>
-        <source>Removing stored permissions...</source>
+        <source>Do you want to update the information in %1 - %2?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Abort</source>
-        <translation>İptal</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: Veri tabanı kilitli!</translation>
     </message>
     <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation type="unfinished"/>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Etkin veri tabanı kilitli!
+Lütfen seçilen veri tabanının kilidini kaldırın veya kilitli olmayan birini seçin.</translation>
     </message>
     <message>
-        <source>KeePassXC: New key association request</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: Anahtarlar veri tabanından kaldırıldı</translation>
     </message>
-    <message>
-        <source>You have received an association request for the above key.
-If you would like to allow it access to your KeePassXC database
-give it a unique name to identify and accept it.</source>
-        <translation type="unfinished"/>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>KeePassXC: Overwrite existing key?</source>
-        <translation>KeePassXC: Var olan anahtarın üstüne yaz?</translation>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: Anahtar bulunamadı</translation>
     </message>
     <message>
-        <source>KeePassXC: Update Entry</source>
-        <translation>KeePassXC: Girdi Güncelle</translation>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>KeePassHttp Ayarlarında paylaşılan şifreleme anahtarı bulunamadı.</translation>
     </message>
     <message>
-        <source>KeePassXC: Database locked!</source>
-        <translation>KeePassXC: Veritabanı kitli!</translation>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: Ayarlar kullanılabilir değil!</translation>
     </message>
     <message>
-        <source>KeePassXC: Removed keys from database</source>
-        <translation>KeePassXC: Anahtarlar veri tabanından kaldırıldı</translation>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Etkin veri tabanı KeePassHttp Ayarlarının girdisini barındırmıyor.</translation>
     </message>
     <message>
-        <source>KeePassXC: No keys found</source>
-        <translation>KeePassXC: Anahtar bulunamadı</translation>
+        <source>Removing stored permissions...</source>
+        <translation>Saklanan izinler kaldırılıyor...</translation>
     </message>
     <message>
-        <source>KeePassXC: Settings not available!</source>
-        <translation>KeePassXC: Ayarlar kullanılabilir değil!</translation>
+        <source>Abort</source>
+        <translation>İptal</translation>
     </message>
     <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: Silinen yetkiler</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
-        <translation type="unfinished"/>
+        <translation>KeePassXC: İzinli girdi bulunamadı!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Etkin veri tabanı izinleri olan girdi barındırmıyor.</translation>
     </message>
 </context>
 <context>
@@ -2074,10 +3538,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Temel Ayarlar</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Yalnızca tek KeePassXC oluşumu başlat</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Son veri tabanlarını anımsa</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Son anahtar dosyalarını ve güvenlik aygıtlarını anımsa</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Başlangıçta önceki veri tabanlarını yükle</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Çıkışta kendiliğinden kaydet</translation>
     </message>
@@ -2086,20 +3566,28 @@ give it a unique name to identify and accept it.</source>
         <translation>Her değişiklik sonrası kendiliğinden kaydet</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Veri tabanı dışarıdan değiştirildiğinde kendiliğinden yeniden yükle</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Panoya kopyalarken simge durumuna küçült</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Uygulama başlangıcında pencereyi simge durumuna küçült</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Girdi oluşturmada küme simgesini kullan</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation type="unfinished"/>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Veri dışı değişiklikler (kümeleri genişletmek gibi) için veri tabanını değiştirildi olarak imleme</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Dil</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2110,95 +3598,93 @@ give it a unique name to identify and accept it.</source>
         <translation>Simge durumuna küçültüldüğünde pencereyi sistem tepsisine gizle</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Başlangıçta önceki veri tabanlarını yükle</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Veri tabanı dışarıdan değiştirildiğinde kendiliğinden yeniden yükle</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Uygulamadan çıkmak yerine pencereyi sistem tepsisine gizle</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Uygulama başlangıcında pencereyi simge durumuna küçült</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Basic Settings</source>
-        <translation>Temel Ayarlar</translation>
+        <source>Language</source>
+        <translation>Dil</translation>
     </message>
     <message>
-        <source>Remember last key files and security dongles</source>
-        <translation type="unfinished"/>
+        <source>Auto-Type</source>
+        <translation>Oto-Yazım</translation>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <source>Use entry title to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Auto-Type</source>
-        <translation>Oto-Yazma</translation>
-    </message>
-    <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
+        <source>Use entry URL to match windows for global Auto-Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
-        <translation type="unfinished"/>
+        <translation>Oto-Yazım gerçekleştirmeden önce her zaman sor</translation>
     </message>
     <message>
-        <source>Auto-Type delay</source>
-        <translation type="unfinished"/>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Küresel Oto-Yazım kısayolu</translation>
     </message>
     <message>
-        <source> ms</source>
-        <translation type="unfinished"/>
+        <source>Auto-Type delay</source>
+        <translation>Oto-Yazım gecikmesi</translation>
     </message>
     <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
+        <source> ms</source>
+        <comment>Milliseconds</comment>
+        <translation>ms</translation>
     </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Zaman Aşımları</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
-        <translation type="unfinished"/>
+        <translation>Şundan sonra panoyu temizle</translation>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"/>
+        <comment>Seconds</comment>
+        <translation>san</translation>
     </message>
     <message>
         <source>Lock databases after inactivity of</source>
-        <translation type="unfinished"/>
+        <translation>Şu kadar hareketsizlikten sonra veri tabanlarını kilitle</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Parolaları öntanımlı olarak düz metinde göster</translation>
+        <source>Convenience</source>
+        <translation>Elverişlilik</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Oturum kilitlendiğinde veya kapak kapandığında veri tabanlarını kilitle</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
-        <translation type="unfinished"/>
+        <translation>Pencereyi küçülttükten sonra veri tabanlarını kilitle</translation>
     </message>
     <message>
         <source>Don&apos;t require password repeat when it is visible</source>
-        <translation type="unfinished"/>
+        <translation>Parola görünür olduğunda yineleme gerektirme</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation type="unfinished"/>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Parolaları öntanımlı olarak düz metinde göster</translation>
     </message>
     <message>
-        <source>Convenience</source>
+        <source>Hide passwords in the preview panel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Oturum kilitlendiğinde veya kapak kapandığında veri tabanlarını kilitle</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2206,7 +3692,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source>Use Google as fallback for downloading website icons</source>
-        <translation type="unfinished"/>
+        <translation>Web site simgelerini indirmek için Google&apos;ı yedek olarak kullan</translation>
     </message>
 </context>
 <context>
@@ -2220,6 +3706,14 @@ give it a unique name to identify and accept it.</source>
         <translation>Anahtar:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Özel ayarlar kullan</translation>
     </message>
@@ -2245,7 +3739,8 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
-        <translation type="unfinished"/>
+        <comment>Seconds</comment>
+        <translation>san</translation>
     </message>
 </context>
 <context>
@@ -2312,27 +3807,7 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
+        <source>Remove an entry from the database.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2340,60 +3815,32 @@ give it a unique name to identify and accept it.</source>
         <translation>Veri tabanının yolu.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Veri tabanının içeriğini çıkar ve yazdır.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Veri tabanının çıkarılacağı yol.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Çalıştırılacak komutun adı.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Veri tabanı girdilerini listele.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation type="unfinished"/>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - çapraz platformlu parola yöneticisi</translation>
     </message>
     <message>
-        <source>Merge two databases.</source>
-        <translation>İki veri tabanını birleştir.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>açılacak parola veri tabanlarının dosya adları (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Veri tabanının nereye birleştirileceği.</translation>
+        <source>path to a custom config file</source>
+        <translation>özel yapılandırma dosyası yolu</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Veri tabanının nereden birleştirileceği.</translation>
+        <source>key file of the database</source>
+        <translation>veri tabanının anahtar dosyası</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Her iki veri tabanı dosyası için aynı parolayı kullan.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>veri tabanının parolasını stdin&apos;den oku</translation>
     </message>
     <message>
-        <source>Show a password.</source>
+        <source>Parent window handle</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Name of the entry to show.</source>
-        <translation>Gösterilecek girdinin adı.</translation>
-    </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_uk.ts b/share/translations/keepassx_uk.ts
index c8abb87fb..e0d9266f4 100644
--- a/share/translations/keepassx_uk.ts
+++ b/share/translations/keepassx_uk.ts
@@ -10,14 +10,34 @@
         <translation>Про програму</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>Повідомляйте про вади на &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC розповсюджується на умовах Загальної публічної ліцензії GNU (GPL) версії 2 або (на ваш вибір) версії 3.</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>Супровідники проекту: </translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>Спільнота</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Переглянути внесок на GitHub&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>Інформація щодо зневадження</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>Коли Ви повідомляєте про ваду, завжди долучайте таку інформацію:</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>Скопіювати у буфер обміну</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>Ревізія: %1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>Бібліотеки:</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</source>
         <source>Enabled extensions:</source>
         <translation>Увімкнені розширення:</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>Повідомляйте про вади на &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC розповсюджується на умовах Загальної публічної ліцензії GNU (GPL) версії 2 або (на ваш вибір) версії 3.</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>Супровідники проекту: </translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;Переглянути внесок на GitHub&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>Коли Ви повідомляєте про ваду, завжди долучайте таку інформацію:</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>Підтвердити доступ KeePassXC до HTTP</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>Запам&apos;ятати цей вибір</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 запросила доступ до гасел для таких записів(-у).
 Будь ласка, вкажіть чи хочете ви дозволити доступ?</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>Підтвердити доступ KeePassXC до HTTP</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>Автозаповнення – KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>Автозаповнення</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>Автозаповнення – KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>Виберіть запис для автозаповнення:</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
+    <message>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>Автозаповнення – KeePassXC</translation>
+        <source>Remember this decision</source>
+        <translation>Запам&apos;ятати цей вибір</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>Дозволити</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>Заборонити</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 запросила доступ до гасел для таких записів(-у).
+Будь ласка, вкажіть чи хочете ви дозволити доступ?</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Діалог</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Загальні</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Запитувати щодо розблокування сховища, якщо воно заблоковане</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>Показувати лише найкращі збіги для певного URL замість усіх записів для всієї області. </translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>Розширені</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>Тільки вибране сховище має бути під&apos;єднаним через клієнта.</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Автоматичне створення та оновлення текстових полів не втілене.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Показати розширені текстові поля, що починаються з «KPH: »</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: новий запит на прив&apos;язку ключа</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC: перезаписати наявний ключ?</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC: оновити запис</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Бажаєте оновити інформацію у %1 – %2?</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC: сховище заблоковане!</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Чинне сховище заблоковане!
+Будь ласка, розблокуйте обране сховище або виберіть інше незаблоковане.</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC: налаштування недоступні!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC: жодного ключа не знайдено</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC: ключі видалені зі сховища</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC: привілеї видалені</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC: запис з привілеями не знайдено!</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Поточне сховище не містить записів з привілеями…</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Please select whether you want to allow access.</source>
         <translation>Повторіть гасло:</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>Файл-&amp;ключ</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>Огляд</translation>
     </message>
@@ -157,6 +465,14 @@ Please select whether you want to allow access.</source>
         <translation>Створити</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>Виклик-відповідь</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>Оновити</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>Файли-ключі</translation>
     </message>
@@ -177,6 +493,10 @@ Please select whether you want to allow access.</source>
         <translation>Обрати файл-ключ</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>Порожнє гасло</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>Ви дійсно хочете використати порожній рядок у якості гасла?</translation>
     </message>
@@ -191,20 +511,15 @@ Please select whether you want to allow access.</source>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>Файл-&amp;ключ</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>Виклик-відповідь</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Оновити</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>Порожнє гасло</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Please select whether you want to allow access.</source>
         <translation>Параметри клонування</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>Додавати « – клон» до заголовка</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>Замінити ім&apos;я користувача і гасло посиланнями</translation>
     </message>
@@ -225,10 +544,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>Скопіювати журнал</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>Додавати « – клон» до заголовка</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>Імпортувати файл CSV</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>Помилка</translation>
     </message>
@@ -340,17 +651,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>байт,</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>рядки,</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>колонки</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Please select whether you want to allow access.</source>
         <translation>Огляд</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>Оновити</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>Виклик-відповідь:</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>Неможливо відкрити сховище.</translation>
     </message>
@@ -380,6 +699,21 @@ Please select whether you want to allow access.</source>
         <translation>Не вдається відкрити файл-ключ</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>Всі файли</translation>
     </message>
@@ -391,14 +725,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>Оберіть файл-ключ</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>Оновити</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>Виклик-відповідь:</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Please select whether you want to allow access.</source>
         <translation>Не вдається відкрити файл-ключ</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>Сховище відкрите без помилок. Обробка не потрібна.</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>Неможливо відкрити сховище.</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>Сховище відкрите без помилок. Обробка не потрібна.</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>Успішно</translation>
     </message>
@@ -440,40 +766,57 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>Назва сховища:</translation>
+        <source>General</source>
+        <translation>Загальні</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>Опис сховища:</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>Раундів перетворень:</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>Типове ім’я користувача:</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> МіБ</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>Перевірка</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>Макс. записів журналу:</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>Макс. розмір журналу:</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>Використовувати смітник</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ You can now save it.</source>
         <translation>Twofish: 256 біт</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>Алгоритм:</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>Раундів перетворень:</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>Назва сховища:</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>Опис сховища:</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>Типове ім’я користувача:</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>Макс. записів журналу:</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>Макс. розмір журналу:</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> МіБ</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>Використовувати смітник</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>Корінь</translation>
     </message>
     <message>
@@ -511,22 +918,48 @@ You can now save it.</source>
         <translation>Файл не знайдено!</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>Відкрити сховище KeePass 1</translation>
+        <source>Unable to open the database.</source>
+        <translation>Неможливо відкрити сховище.</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>Сховище KeePass 1</translation>
+        <source>File opened in read only mode.</source>
+        <translation>Файл відкритий лише для читання.</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>Відкрити CSV файл</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>Файл CSV</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>Усі файли (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>Об&apos;єднати сховище</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>Відкрити сховище KeePass 1</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>Сховище KeePass 1</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>Закрити?</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>«%1» в режимі редагування.
+Відхилити зміни і все одно закрити?</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>Зберегти зміни?</translation>
     </message>
@@ -541,10 +974,22 @@ Save changes?</source>
         <translation>Записати сховище не вдалося.</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>Гасла</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>Зберегти сховище як</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>Експортувати сховище у файл CSV</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>Не вдалось записати CSV файл.</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>Нове сховище</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 Натисніть «скасувати», щоб завершити зміни або відкинути їх.</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>Це сховище не було збережене.
-Ви можете зберегти сховище або зупинити його блокування.</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,70 +1015,14 @@ Otherwise your changes are lost.</source>
 Ви хочете зберегти його перед блокуванням?
 Інакше внесені зміни буде втрачено.</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>«%1» в режимі редагування.
-Відхилити зміни і все одно закрити?</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>Експортувати сховище у файл CSV</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>Файл CSV</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>Не вдалось записати CSV файл.</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>Неможливо відкрити сховище.</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>Об&apos;єднати сховище</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>Сховище, яке Ви намагаєтесь зберегти, заблоковане іншим примірником KeePassXC.
-Все одно зберегти?</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>Гасла</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>Сховище вже відкрите</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>Сховище, яке Ви намагаєтесь відкрити, заблоковане іншим примірником KeePassXC.
-
-Все одно відкрити?</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>Відкрити лише для читання</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>Файл відкритий лише для читання.</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>Відкрити CSV файл</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>Шукаю…</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>Змінити головний ключ</translation>
     </message>
@@ -660,36 +1043,44 @@ Do you want to open it anyway?</source>
         <translation>Ви дійсно хочете остаточно видалити %1 записи(-ів)?</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>Перемістити запис у смітник?</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>Ви справді хочете перемістити запис «%1» у смітник?</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>Перемістити записи до смітника?</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>Ви дійсно хочете перемістити %n запис у смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записи в смітник?</numerusform><numerusform>Ви дійсно хочете перемістити %n записів у смітник?</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>Видалити групу?</translation>
+        <source>Execute command?</source>
+        <translation>Виконати команду?</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>Ви дійсно хочете остаточно видалити групу «%1»?</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>Ви справді хочете виконати таку команду? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Неможливо вирахувати головний ключ</translation>
+        <source>Remember my choice</source>
+        <translation>Запам&apos;ятати мій вибір</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>Перемістити запис у смітник?</translation>
+        <source>Delete group?</source>
+        <translation>Видалити групу?</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>Ви справді хочете перемістити запис «%1» у смітник?</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>Ви дійсно хочете остаточно видалити групу «%1»?</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>Шукаю…</translation>
+        <source>Unable to calculate master key</source>
+        <translation>Неможливо вирахувати головний ключ</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -708,20 +1099,8 @@ Do you want to open it anyway?</source>
         <translation>Збіги відсутні</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>Виконати команду?</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>Ви справді хочете виконати таку команду? &lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>Запам&apos;ятати мій вибір</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>Запит на автозавантаження</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -732,8 +1111,9 @@ Do you want to open it anyway?</source>
         <translation>Запит на об&apos;єднання</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>Файл сховища змінено, але Ви маєте незбережені зміни. Об&apos;єднати Ваші зміни зі змінами у файлі?</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -749,6 +1129,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>Закрити</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>Загальні</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Гасло</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>Ім’я користувача</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Вкладення</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>Примітки</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>Вікно</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>Послідовність</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>Пошук</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>Очистити</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -775,6 +1238,30 @@ Do you want to open it anyway?</source>
         <translation>Журнал</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>Журнал запису</translation>
     </message>
@@ -795,22 +1282,20 @@ Do you want to open it anyway?</source>
         <translation>Новий атрибут</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>Вибрати файл</translation>
+        <source>Confirm Remove</source>
+        <translation>Схваліть видалення</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>Неможливо відкрити файл</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>Ви дійсно бажаєте видалити цей атрибут?</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>Зберегти вкладення</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>Неможливо зберегти вкладення:
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -818,32 +1303,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n тиждень</numerusform><numerusform>%n тижні</numerusform><numerusform>%n тижнів</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n місяць</numerusform><numerusform>%n місяці</numerusform><numerusform>%n місяців</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 рік</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>Схваліть видалення</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>Ви дійсно бажаєте видалити цей атрибут?</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[ЗАХИЩЕНО] Натисніть «показати», щоб переглянути або змінити</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>Ви дійсно бажаєте видалити це вкладення?</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -860,18 +1329,6 @@ Do you want to open it anyway?</source>
         <translation>Видалити</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>Вкладення</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>Зберегти</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Відкрити</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>Змінити назву</translation>
     </message>
@@ -883,6 +1340,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>Показати</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>Вкладення</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -891,6 +1352,18 @@ Do you want to open it anyway?</source>
         <translation>Увімкнути автозаповнення для цього запису</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>Успадкувати типову послідовність автозаповнення від &amp;групи</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>Використати власну послідовність автозаповнення</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>Прив&apos;язки вікон</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -903,14 +1376,6 @@ Do you want to open it anyway?</source>
         <translation>Заголовок вікна:</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>Успадкувати типову послідовність автозаповнення від &amp;групи</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>Використати власну послідовність автозаповнення</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>Використати типову послідовність</translation>
     </message>
@@ -918,10 +1383,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>Установити власну послідовність:</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>Прив&apos;язки вікон</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -945,12 +1406,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>Заголовок:</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Ім’я користувача:</translation>
+        <source>URL:</source>
+        <translation>URL:</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -961,20 +1418,104 @@ Do you want to open it anyway?</source>
         <translation>Гасло ще раз:</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>URL:</translation>
+        <source>Title:</source>
+        <translation>Заголовок:</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Закінчується</translation>
+        <source>Notes</source>
+        <translation>Примітки</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>Заготовки</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>Примітки:</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>Ім’я користувача:</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>Закінчується</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>Скопіювати у буфер обміну</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1046,6 +1587,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>Використати типовий значок</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>Використати власний значок</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>Додати свій значок</translation>
     </message>
@@ -1054,6 +1603,18 @@ Do you want to open it anyway?</source>
         <translation>Видалити свій значок</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>Завантажити фавікон</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>Неможливо дістати фавікон</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>Порада: Ви можете увімкнути Google у якості запасного варіанту шляхом вибору Інструменти&gt;Налаштування&gt;Безпека</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>Зображення</translation>
     </message>
@@ -1066,24 +1627,12 @@ Do you want to open it anyway?</source>
         <translation>Вибір зображення</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>Завантажити фавікон</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>Неможливо дістати фавікон</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>Неможливо прочитати значок</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>Використати типовий значок</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>Використати власний значок</translation>
+        <source>Custom icon already exists</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1093,14 +1642,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>Цей значок використовують %1 записи. Він буде замінений типовим значком. Ви дійсно бажаєте видалити його?</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>Порада: Ви можете увімкнути Google у якості запасного варіанту шляхом вибору Інструменти&gt;Налаштування&gt;Безпека</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1125,10 +1666,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>– клон</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>Назва</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>Додати</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>Видалити</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>Відкрити</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>Зберегти</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>Схваліть видалення</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1157,6 +1782,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>Пос.:</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>Група</translation>
     </message>
@@ -1172,11 +1802,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>URL</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>Пос.:</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1186,6 +1811,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1248,6 +1884,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Неможливо вирахувати головний ключ</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Неможливо видати виклик-відповідь.</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>Неправильний ключ або файл сховища пошкоджено.</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>Неможливо видати виклик-відповідь.</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Неможливо вирахувати головний ключ</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Неможливо вирахувати головний ключ</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>Неможливо вирахувати головний ключ</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>Не сховище KeePass.</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>Вибраний файл є старим сховищем для KeePass 1 (.kdb).
+
+Щоб імпортувати його, виберіть пункт меню «Сховище &gt; Імпортувати сховище KeePass 1…».
+Перетворення можливе лише в одному напрямку. Ви не зможете відкрити імпортоване сховище старою версією KeePassX 0.4.</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1266,7 +2257,7 @@ Do you want to open it anyway?</source>
     </message>
     <message>
         <source>Not a KeePass database.</source>
-        <translation>Це не сховище KeePass.</translation>
+        <translation>Не сховище KeePass.</translation>
     </message>
     <message>
         <source>Unsupported encryption algorithm.</source>
@@ -1277,6 +2268,35 @@ Do you want to open it anyway?</source>
         <translation>Версія сховища KeePass не підтримується.</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>Корінь</translation>
     </message>
@@ -1288,129 +2308,141 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>Неправильний ключ або файл сховища пошкоджено.</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>Не сховище KeePass.</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>Версія сховища KeePass не підтримується.</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>Неправильний ключ або файл сховища пошкоджено.</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Неможливо вирахувати головний ключ</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Неможливо видати виклик-відповідь.</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>Вибраний файл є старим сховищем для KeePass 1 (.kdb).
-
-Щоб імпортувати його, виберіть пункт меню «Сховище &gt; Імпортувати сховище KeePass 1…».
-Перетворення можливе лише в одному напрямку. Ви не зможете відкрити імпортоване сховище старою версією KeePassX 0.4.</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>Неможливо видати виклик-відповідь.</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>Неможливо вирахувати головний ключ</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>Невиправна помилка в процесі тестування криптографічних функцій.</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC – помилка</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>Неможливо створити блокувальний файл. Режим одного примірника вимкнено.</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>Інший примірник KeePassXC вже запущений.</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>Відкрити сховище</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>Параметри сховища</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>Копіювати ім’я користувача в буфер обміну</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>Копіювати гасло в буфер обміну</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Налаштування</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>Показати панель инструментів</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>тільки для читання</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>Перемкнути вікно</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>Сховище KeePass 2</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>Всі файли</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>Зберегти налагоджене сховище</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>Записати сховище не вдалося.</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>Неможливо створити блокувальний файл. Режим одного примірника вимкнено.</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>Інший примірник KeePassXC вже запущений.</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>Невиправна помилка в процесі тестування криптографічних функцій.</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC – помилка</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>Сховище</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>Останні сховища</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>Імпорт</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>Довідка</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>Записи</translation>
     </message>
@@ -1419,12 +2451,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Копіювати атрибут до буферу обміну</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>Групи</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>Перегляд</translation>
+        <source>&amp;Tools</source>
+        <translation>Інструменти</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1435,6 +2471,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Про KeePassXC</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>Відкрити сховище…</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>Зберігти сховище</translation>
     </message>
@@ -1475,24 +2515,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Видалити групу</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>Налаштування сховища</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>Зберегти сховище як…</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>Клонувати запис</translation>
+        <source>Change &amp;master key...</source>
+        <translation>Змінити головний ключ…</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>Тимчасове одноразове гасло</translation>
+        <source>&amp;Database settings</source>
+        <translation>Налаштування сховища</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>Скопіювати ТОГ</translation>
+        <source>Database settings</source>
+        <translation>Параметри сховища</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>Показати ТОГ</translation>
+        <source>&amp;Clone entry</source>
+        <translation>Клонувати запис</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1503,14 +2543,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Копіювати ім&apos;я користувача</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>Копіювати ім’я користувача в буфер обміну</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>Копіювати гасло</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>Копіювати гасло в буфер обміну</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>Налаштування</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>Виробник гасел</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>Виконати автозаповнення</translation>
     </message>
@@ -1527,165 +2579,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>Заголовок</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>&amp;URL</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>Нотатки</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>Виробник гасел</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>Очистити журнал</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>Експортувати до файлу CSV…</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>Сховище</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>Імпортувати сховище KeePass 1…</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>Імпорт</translation>
+        <source>Import CSV file...</source>
+        <translation>Імпортувати файл CSV…</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>Інструменти</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>Полагодити сховище…</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>Показати ТОГ</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>Налаштувати ТОГ…</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>Скопіювати ТОГ</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>Спорожнити смітник</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>Очистити журнал</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>Помилка доступу до файлу конфігурації %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>Вийти з KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>Натисніть, будь ласка, кнопку на вашому YubiKey!</translation>
+        <source>read-only</source>
+        <translation>тільки для читання</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>Довідка</translation>
+        <source>Settings</source>
+        <translation>Налаштування</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>Відкрити сховище…</translation>
+        <source>Toggle window</source>
+        <translation>Перемкнути вікно</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>Зберегти сховище як…</translation>
+        <source>Quit KeePassXC</source>
+        <translation>Вийти з KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>Змінити головний ключ…</translation>
+        <source>KeePass 2 Database</source>
+        <translation>Сховище KeePass 2</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>Експортувати до файлу CSV…</translation>
+        <source>All files</source>
+        <translation>Всі файли</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>Імпортувати сховище KeePass 1…</translation>
+        <source>Open database</source>
+        <translation>Відкрити сховище</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>Імпортувати файл CSV…</translation>
+        <source>Save repaired database</source>
+        <translation>Зберегти налагоджене сховище</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>Полагодити сховище…</translation>
+        <source>Writing the database failed.</source>
+        <translation>Записати сховище не вдалося.</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>Налаштувати ТОГ…</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>Натисніть, будь ласка, кнопку на вашому YubiKey!</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>Діалог</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>Загальні</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>Показувати повідомлення, коли надходить запит на реєстраційні дані</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>Сортувати збіги за ім&apos;ям користувача</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>Видалити всі збережені привілеї для записів у активному сховищу</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Розширені</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>Завжди дозволяти доступ до записів</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>Завжди дозволяти оновлення записів</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>Шукати збіги у всіх відкритих сховищах</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>Шлюз HTTP:</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation> Типовий шлюз: 19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>Запитувати щодо розблокування сховища, якщо воно заблоковане</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>Сортувати збіги за заголовком</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC чекатиме на сигнали через цей шлюз за адресою 127.0.0.1</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>Неможливо приєднатись до привілейованих шлюзів</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>Неможливо приєднатись до привілейованих шлюзів нижче 1024!
-Натомість буде використано шлюз 19455.</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>Видалити всі спільні шифрувальні ключі з активного сховища</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>Показати розширені текстові поля, що починаються з «KPH: »</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>Автоматичне створення та оновлення текстових полів не втілене.</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>Діалог</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1696,6 +2793,15 @@ Using default port 19455.</source>
         <translation>Увімкнути сервер KeePassHTTP</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>Загальні</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>Показувати повідомлення, коли надходить запит на реєстраційні дані</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>Показувати лише найкращі збіги для певного URL замість усіх записів для всієї області. </translation>
     </message>
@@ -1704,6 +2810,10 @@ Using default port 19455.</source>
         <translation>Показувати лише найкращі збіги</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>Запитувати щодо розблокування сховища, якщо воно заблоковане</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>Показані тільки записи з такою самою схемою (http://, https://, ftp://, …).</translation>
     </message>
@@ -1712,27 +2822,108 @@ Using default port 19455.</source>
         <translation>Узгодити зі схемами URL</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>Сортувати збіги за ім&apos;ям користувача</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>Сортувати збіги за заголовком</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>Видалити всі спільні шифрувальні ключі з активного сховища</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>Видалити всі збережені привілеї для записів у активному сховищу</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>Виробник гасел</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>Розширені</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>Завжди дозволяти доступ до записів</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>Завжди дозволяти оновлення записів</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>Тільки вибране сховище має бути під&apos;єднаним через клієнта.</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>Змінення цих налаштувань може бути небезпечним!
-Змінюйте тільки якщо Ви певно знаєте, що ви робите.</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>Шукати збіги у всіх відкритих сховищах</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>Автоматичне створення та оновлення текстових полів не втілене.</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>Показати розширені текстові поля, що починаються з «KPH: »</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>Шлюз HTTP:</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation> Типовий шлюз: 19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC чекатиме на сигнали через цей шлюз за адресою 127.0.0.1</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>Неможливо приєднатись до привілейованих шлюзів</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>Неможливо приєднатись до привілейованих шлюзів нижче 1024!
+Натомість буде використано шлюз 19455.</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>Гасло:</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>надійність</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>ентропія</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>Гасло</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>Види символів</translation>
     </message>
@@ -1753,38 +2944,50 @@ Change them only if you know what you are doing.</source>
         <translation>Спеціальні символи</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>Розширені ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>Виключити неоднозначні символи</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>Прийняти</translation>
+        <source>Pick characters from every group</source>
+        <translation>Використати символи з кожної групи</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>Довжина:</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>надійність</translation>
+        <source>Passphrase</source>
+        <translation>Вираз гасла</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>ентропія</translation>
+        <source>Wordlist:</source>
+        <translation>Перелік слів:</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>Довжина:</translation>
+        <source>Word Count:</source>
+        <translation>Кількість слів</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>Використати символи з кожної групи</translation>
+        <source>Word Separator:</source>
+        <translation>Розділювач слів</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>Створити</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>Копіювати</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>Прийняти</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>Закрити</translation>
     </message>
@@ -1802,51 +3005,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>Погана</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>Низька</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>Добра</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>Відмінна</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>Гасло</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>Розширені ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>Вираз гасла</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>Перелік слів:</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>Кількість слів</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>Розділювач слів</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>Копіювати</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>Шлях до сховища.</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>URL</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>Видобути і надрукувати вміст сховища.</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>Шлях до сховища, щоб відкрити.</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>Назва команди до виконання.</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>Показати перелік сховищ.</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>Шлях групи. Типовим є /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>Об&apos;єднати два сховища.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>Шлях до сховища, з яким об&apos;єднати.</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>Шлях до сховища, яке об&apos;єднати.</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>Назва запису для показу.</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL пристрій</translation>
@@ -1870,8 +3292,28 @@ Change them only if you know what you are doing.</source>
         <translation>бракує закривальних лапок</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>ВНУТРІШНЯ: успішне звільнення нижньої межі</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Group</source>
@@ -1890,14 +3332,22 @@ Change them only if you know what you are doing.</source>
         <translation>Гасло</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>URL</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>Примітки</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>Підключення до переглядача</translation>
     </message>
@@ -1913,6 +3363,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>Пасивне</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1951,8 +3405,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>Чутливість до регістру</translation>
+        <source>Search...</source>
+        <translation>Шукати...</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1963,8 +3417,8 @@ Change them only if you know what you are doing.</source>
         <translation>Очистити</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>Шукати...</translation>
+        <source>Case Sensitive</source>
+        <translation>Чутливість до регістру</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1974,50 +3428,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>Спільний ключ шифрування з назвою «%1» вже існує.
-Перезаписати його?</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>Бажаєте оновити інформацію у %1 – %2?</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>Чинне сховище заблоковане!
-Будь ласка, розблокуйте обране сховище або виберіть інше незаблоковане.</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>Успішно видалив %1 шифрування-%2 з налаштувань KeePassX/KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>Не знайдено спільних ключів шифрування  у налаштуваннях KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>Поточне сховище не містить налаштувань KeePassHttp.</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>Видалення збережених привілеїв…</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>Скасувати</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>Успішно видалив привелеї для %1 %2.</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>Поточне сховище не містить записів з привілеями…</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: новий запит на прив&apos;язку ключа</translation>
     </message>
@@ -2034,33 +3444,77 @@ give it a unique name to identify and accept it.</source>
         <translation>KeePassXC: перезаписати наявний ключ?</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>Спільний ключ шифрування з назвою «%1» вже існує.
+Перезаписати його?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC: оновити запис</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>Бажаєте оновити інформацію у %1 – %2?</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC: сховище заблоковане!</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>Чинне сховище заблоковане!
+Будь ласка, розблокуйте обране сховище або виберіть інше незаблоковане.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC: ключі видалені зі сховища</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC: жодного ключа не знайдено</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>Не знайдено спільних ключів шифрування  у налаштуваннях KeePassHttp.</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC: налаштування недоступні!</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>Поточне сховище не містить налаштувань KeePassHttp.</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>Видалення збережених привілеїв…</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>Скасувати</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC: привілеї видалені</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC: запис з привілеями не знайдено!</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>Поточне сховище не містить записів з привілеями…</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2084,10 +3538,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>Базові налаштування</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>Запускати лише один примірник KeePassXC</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>Пам’ятати останнє сховище</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>Пам&apos;ятати останні файли ключів і механізми захисту</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>Завантажувати попереднє сховище під час запуску</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>Автоматично зберігати при виході</translation>
     </message>
@@ -2096,20 +3566,28 @@ give it a unique name to identify and accept it.</source>
         <translation>Автоматично зберігати після кожної зміни</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>Автоматично перезавантажувати сховище після зовнішніх змін</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>Згортати при копіюванні до буфера обміну</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>Згорнути вікно після запуску застосунку</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>Використовувати для нових записів значок групи</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>Глобальні сполучення клавіш для автозаповнення</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>Не помічати сховище зміненим після змін, що не стосуються даних (напр. розкриття груп)</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>Мова</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2120,66 +3598,60 @@ give it a unique name to identify and accept it.</source>
         <translation>При згортанні ховати вікно в область системних повідомлень</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>Завантажувати попереднє сховище під час запуску</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>Автоматично перезавантажувати сховище після зовнішніх змін</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>Ховати вікно у системний лоток замість закриття застосунку.</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>Згорнути вікно після запуску застосунку</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>Базові налаштування</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>Пам&apos;ятати останні файли ключів і механізми захисту</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>Не помічати сховище зміненим після змін, що не стосуються даних (напр. розкриття груп)</translation>
+        <source>Language</source>
+        <translation>Мова</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>Автозаповнення</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>Використовувати заголовок запису і URL для добору вікон у загальному автозаповненні</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>Завжди питати перед автозаповненням</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>Глобальні сполучення клавіш для автозаповнення</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>Затримка автозаповнення</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>мс</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>Запускати лише один примірник KeePassXC</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>Час очикування</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>Очищати буфер обміну через</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>сек</translation>
     </message>
     <message>
@@ -2187,8 +3659,12 @@ give it a unique name to identify and accept it.</source>
         <translation>Заблокувати сховище, неактивне протягом</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>Типово показувати гасло у відкритому вигляді</translation>
+        <source>Convenience</source>
+        <translation>Зручність</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>Блокувати сховища після блокування сесії або закриття кришки пристрою</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2199,16 +3675,16 @@ give it a unique name to identify and accept it.</source>
         <translation>Не запитувати підтвердження гасла, якщо воно не приховане</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>Час очикування</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>Типово показувати гасло у відкритому вигляді</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>Зручність</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>Блокувати сховища після блокування сесії або закриття кришки пристрою</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2230,6 +3706,14 @@ give it a unique name to identify and accept it.</source>
         <translation>Ключ:</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>Використовувати власні налаштування</translation>
     </message>
@@ -2255,6 +3739,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>сек</translation>
     </message>
 </context>
@@ -2322,88 +3807,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>шлях до власного файла налаштувань</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>файл-ключ сховища</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC – багатоплатформовий керманич гасел</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>прочитати гасло для сховища зі stdin</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>Назви файлів сховищ, які треба відкрити (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>Скопіювати гасло до буферу обміну</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>Шлях до сховища.</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>Використовувати графічний інтерфейс для розблокування сховища.</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>Назва запису для відтинання.</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>Видобути і надрукувати вміст сховища.</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>Шлях до сховища, щоб відкрити.</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>Назва команди до виконання.</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>Показати перелік сховищ.</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>Шлях групи. Типовим є /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>Показувати UUID для записів і груп.</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge two databases.</source>
-        <translation>Об&apos;єднати два сховища.</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC – багатоплатформовий керманич гасел</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>Шлях до сховища, з яким об&apos;єднати.</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>Назви файлів сховищ, які треба відкрити (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>Шлях до сховища, яке об&apos;єднати.</translation>
+        <source>path to a custom config file</source>
+        <translation>шлях до власного файла налаштувань</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>Використовувати те саме гасло для обох сховищ.</translation>
+        <source>key file of the database</source>
+        <translation>файл-ключ сховища</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>Показати гасло.</translation>
+        <source>read password of the database from stdin</source>
+        <translation>прочитати гасло для сховища зі stdin</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>Назва запису для показу.</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_zh_CN.ts b/share/translations/keepassx_zh_CN.ts
index 0d5e2806f..1cc8b409b 100644
--- a/share/translations/keepassx_zh_CN.ts
+++ b/share/translations/keepassx_zh_CN.ts
@@ -10,14 +10,34 @@
         <translation>关于</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>前往报告 bug：&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC 使用第 2 版 GNU 通用公共授权协议(GPL)分发，你也可以根据需要选用第 3 版。</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>项目维护者：</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>贡献者</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;在 GitHub 上查阅贡献信息&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>调试信息</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>报告任何 bug 时，请包含以下信息：</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>复制到剪贴板</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>修订版本：%1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>发行版: %1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>库：</translation>
     </message>
@@ -47,34 +71,14 @@ CPU 架构：%2
         <source>Enabled extensions:</source>
         <translation>已启用的扩展：</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>前往报告 bug：&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC 使用第 2 版 GNU 通用公共授权协议(GPL)分发，你也可以根据需要选用第 3 版。</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>项目维护者：</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;在 GitHub 上查阅贡献信息&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>报告任何 bug 时，请包含以下信息：</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP 确认访问</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>记住此选项</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 请求获取这些条目的密码。
 请选择是否允许。</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP 确认访问</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>KeePassXC - 自动输入</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>自动输入</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>KeePassXC - 自动输入</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>选择自动输入的项目</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>KeePassXC - 自动输入</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>记住此选项</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>允许</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>拒绝</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 请求获取这些条目的密码。
+请选择是否允许。</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>对话框</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation>&amp;Google Chrome</translation>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation>&amp;Firefox</translation>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation>&amp;Chromium</translation>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation>&amp;Vivaldi</translation>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>数据库锁定时请求解锁(Q)</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>只返回特定网址的最佳匹配，而不是整个域名的所有条目。</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>高级</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>只有选定的数据库必须与一个客户端连接。</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>不支持自动创建或更新字符串字段。</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>返回以“KPH:”开头的高级字符串字段(R)</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC: 新的密钥关联请求</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC︰ 覆盖现有的密钥吗？</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC︰ 更新条目</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>你想更新 %1-%2 中的信息吗？</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC︰ 数据库被锁定 ！</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>激活的数据库被锁定 ！
+请解锁选定的数据库或选择另一已解锁的数据库。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC︰ 设置不可用 ！</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC︰ 未找到键</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC︰ 从数据库中删除键</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中断</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC︰ 已删除的权限</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC： 未找到权限的条目！</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>当前数据库中不包含具有权限的条目。</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Please select whether you want to allow access.</source>
         <translation>重复密码：</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>密钥文件(K)</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>浏览</translation>
     </message>
@@ -157,6 +465,14 @@ Please select whether you want to allow access.</source>
         <translation>创建</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>挑战应答(L)</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>刷新</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>密钥文件</translation>
     </message>
@@ -177,6 +493,10 @@ Please select whether you want to allow access.</source>
         <translation>选择密钥文件</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>空密码</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>你确定要使用空密码？</translation>
     </message>
@@ -191,20 +511,15 @@ Please select whether you want to allow access.</source>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>密钥文件(K)</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>挑战应答(L)</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>刷新</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>空密码</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Please select whether you want to allow access.</source>
         <translation>复制选项</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>标题后附加 “ - 副本”</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>用参考条目替换用户名和密码</translation>
     </message>
@@ -225,10 +544,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>复制历史</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>标题后附加 “ - 副本”</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>导入 CSV 文件</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>错误</translation>
     </message>
@@ -340,17 +651,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation>字节，</translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation>行，</translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation>列</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Please select whether you want to allow access.</source>
         <translation>浏览</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>刷新</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>挑战应答：</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>无法打开数据库</translation>
     </message>
@@ -380,6 +699,21 @@ Please select whether you want to allow access.</source>
         <translation>无法打开密钥文件</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>所有文件</translation>
     </message>
@@ -391,14 +725,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>选择密钥文件</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>刷新</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>挑战应答：</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Please select whether you want to allow access.</source>
         <translation>无法打开密钥文件</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>数据库打开正常。没什么可做的。</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>无法打开数据库</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>数据库打开正常。没什么可做的。</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>成功</translation>
     </message>
@@ -440,40 +766,57 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>数据库名称：</translation>
+        <source>General</source>
+        <translation>常规</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>数据库描述：</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>加密次数：</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>默认用户名：</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation>MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>基准测试</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>最大历史记录数：</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>最大历史记录大小：</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>启用回收站</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -484,14 +827,78 @@ You can now save it.</source>
         <translation>Twofish: 256 位</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>算法：</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>加密次数：</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation>MB</translation>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>数据库名称：</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>数据库描述：</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>默认用户名：</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>最大历史记录数：</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>最大历史记录大小：</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation>MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>启用回收站</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>根群组</translation>
     </message>
     <message>
@@ -511,22 +918,48 @@ You can now save it.</source>
         <translation>找不到文件！</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>打开 KeePass 1 数据库</translation>
+        <source>Unable to open the database.</source>
+        <translation>无法打开数据库</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 数据库</translation>
+        <source>File opened in read only mode.</source>
+        <translation>文件在只读模式下打开。</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>打开 CSV 文件</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV 文件</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>所有文件 (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>合并数据库</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>打开 KeePass 1 数据库</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 数据库</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>关闭？</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>正在编辑 &quot;%1&quot; 。
+仍然要放弃修改并且关闭吗？</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>保存修改？</translation>
     </message>
@@ -541,10 +974,22 @@ Save changes?</source>
         <translation>数据库写入失败</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>密码</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>数据库另存为</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>导出数据库为 CSV 文件</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>写入 CSV 文件失败</translation>
+    </message>
+    <message>
         <source>New database</source>
         <translation>新建数据库</translation>
     </message>
@@ -563,12 +1008,6 @@ Please press cancel to finish your changes or discard them.</source>
 点击“取消”继续编辑, 点击“确定”丢弃更改。</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>数据库尚未保存。
-你可以保存数据库或者取消锁定。</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -576,69 +1015,14 @@ Otherwise your changes are lost.</source>
 你想在锁定它之前保存修改吗？
 否则修改将会丢失。</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>正在编辑 &quot;%1&quot; 。
-仍然要放弃修改并且关闭吗？</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>导出数据库为 CSV 文件</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV 文件</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>写入 CSV 文件失败</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>无法打开数据库</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>合并数据库</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>你要保存的数据库已被另一个 KeePassXC 实例锁定。
-你仍然要保存吗？</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>密码</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>数据库已经打开</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>你要打开的数据库已被另一个 KeePassXC 实例锁定。
-你仍然要打开吗？</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>以只读方式打开</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>文件在只读模式下打开。</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>打开 CSV 文件</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>搜索中...</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>更改主密码</translation>
     </message>
@@ -659,36 +1043,44 @@ Do you want to open it anyway?</source>
         <translation>你确定永远删除 &quot;%1&quot; 项目吗？</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>移动项目到回收站？</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>是否删除 &quot;%1&quot; 项目到回收站？</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>移动项目到垃圾桶？</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>你确定要将 %n 个项目移到垃圾桶？</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>删除群组？</translation>
+        <source>Execute command?</source>
+        <translation>执行命令？</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>你确定永久删除 &quot;%1&quot; 群组吗？</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>你确定要执行以下命令？&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>无法计算主密码</translation>
+        <source>Remember my choice</source>
+        <translation>记住我的选择</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>移动项目到回收站？</translation>
+        <source>Delete group?</source>
+        <translation>删除群组？</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>是否删除 &quot;%1&quot; 项目到回收站？</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>你确定永久删除 &quot;%1&quot; 群组吗？</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>搜索中...</translation>
+        <source>Unable to calculate master key</source>
+        <translation>无法计算主密码</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1099,8 @@ Do you want to open it anyway?</source>
         <translation>无结果</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>执行命令？</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>你确定要执行以下命令？&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>记住我的选择</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>自动加载请求</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1111,9 @@ Do you want to open it anyway?</source>
         <translation>合并请求</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>数据库文件已更改，您有未保存的更改。是否合并您的更改？</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1129,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>关闭</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>网址</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>用户名</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>备注</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>窗口</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>顺序</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>搜索</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>清除</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1238,30 @@ Do you want to open it anyway?</source>
         <translation>历史记录</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>项目历史</translation>
     </message>
@@ -794,22 +1282,20 @@ Do you want to open it anyway?</source>
         <translation>添加属性</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>选择文件</translation>
+        <source>Confirm Remove</source>
+        <translation>确认删除</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>无法打开文件</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>你确定要移除这个属性？</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>保存附件</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>无法保存附件：
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1303,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n 周</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n 个月</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 年</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>确认删除</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>你确定要移除这个属性？</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[受保护的内容] 点击“揭示”来查看或编辑</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>你确定要移除这个附加内容？</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1329,6 @@ Do you want to open it anyway?</source>
         <translation>移除</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>附件</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>保存</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>打开</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>编辑名称</translation>
     </message>
@@ -882,6 +1340,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>揭示</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1352,18 @@ Do you want to open it anyway?</source>
         <translation>为此项目启用自动输入</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>从父群组继承默认的自动输入顺序(G)</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>使用自定义自动输入顺序(U)</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>窗口组合</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1376,6 @@ Do you want to open it anyway?</source>
         <translation>窗口标题：</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>从父群组继承默认的自动输入顺序(G)</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>使用自定义自动输入顺序(U)</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>使用默认顺序(Q)</translation>
     </message>
@@ -917,10 +1383,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>设置自定义顺序(M)</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>窗口组合</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1406,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>标题：</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>用户名：</translation>
+        <source>URL:</source>
+        <translation>网址：</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1418,104 @@ Do you want to open it anyway?</source>
         <translation>重复密码：</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>网址：</translation>
+        <source>Title:</source>
+        <translation>标题：</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>过期</translation>
+        <source>Notes</source>
+        <translation>备注</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>预设</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>备注：</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>用户名：</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>过期</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>复制到剪贴板</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1045,6 +1587,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>使用默认图标(U)</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>使用自定义图标(M)</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>添加自定义图标</translation>
     </message>
@@ -1053,6 +1603,18 @@ Do you want to open it anyway?</source>
         <translation>删除自定义图标</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>下载网站图标</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>无法获取网站图标</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>提示：你可以在 工具 &gt; 设置 &gt; 安全 中启用 Google 作为备选</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>图片</translation>
     </message>
@@ -1065,24 +1627,12 @@ Do you want to open it anyway?</source>
         <translation>选择图片</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>下载网站图标</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>无法获取网站图标</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>无法读取图标</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>使用默认图标(U)</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>使用自定义图标(M)</translation>
+        <source>Custom icon already exists</source>
+        <translation>已经存在自定义图标</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1642,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>这个图标被 %1 个条目使用，将会被默认图标替换。你确定要删除它吗？</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>提示：你可以在 工具 &gt; 设置 &gt; 安全 中启用 Google 作为备选</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1666,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation>- 副本</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>名称</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>添加</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>移除</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>打开</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>保存</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>确认删除</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1782,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>参考条目：</translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>群组</translation>
     </message>
@@ -1171,11 +1802,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>网址</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>参考条目：</translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1811,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1884,360 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>无法计算主密码</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>无法发出挑战应答</translation>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>密钥错误或数据库损坏</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation>无法发出挑战应答</translation>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>无法计算主密码</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>无法计算主密码</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>无法计算主密码</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>不是 KeePass 数据库</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>当前选择的文件是旧版本的 KeePass 1 数据库(.kdb)。
+你可以通过点击 数据库 &gt; 导入 KeePass 1 数据库 来导入。
+这是不可逆的迁移，导入后的数据库将无法由旧版本的 KeePassX 0.4 打开。</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1276,6 +2267,35 @@ Do you want to open it anyway?</source>
         <translation>不支持的 KeePass 数据库版本</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>根群组</translation>
     </message>
@@ -1287,128 +2307,141 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>密钥错误或数据库损坏</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>不是 KeePass 数据库</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>不支持的 KeePass 数据库版本</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>密钥错误或数据库损坏</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>无法计算主密码</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>无法发出挑战应答</translation>
+        <source>Incorrect group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>当前选择的文件是旧版本的 KeePass 1 数据库(.kdb)。
-你可以通过点击 数据库 &gt; 导入 KeePass 1 数据库 来导入。
-这是不可逆的迁移，导入后的数据库将无法由旧版本的 KeePassX 0.4 打开。</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
-        <translation>无法发出挑战应答</translation>
+        <source>Incorrect group modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>无法计算主密码</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>在测试加密函数时发生重大错误。</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - 错误</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>无法创建锁定文件。 单实例模式已禁用。</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>另一个 KeePassXC 实例已在运行</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>打开数据库</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>数据库设置</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>将用户名复制到剪贴板</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>将密码复制到剪贴板</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>设置</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>显示工具栏</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>只读</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>切换窗口</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 数据库</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>所有文件</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>保存修复后的数据库</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation>单实例锁无效，正在重启实例</translation>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>数据库写入失败</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>无法创建锁定文件。 单实例模式已禁用。</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>另一个 KeePassXC 实例已在运行</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>在测试加密函数时发生重大错误。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - 错误</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>数据库(D)</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>最近的数据库(R)</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>导入</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>帮助(H)</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>项目(N)</translation>
     </message>
@@ -1417,12 +2450,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>将属性复制到剪贴板(R)</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>群组(G)</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>显示(V)</translation>
+        <source>&amp;Tools</source>
+        <translation>工具(T)</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1433,6 +2470,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>关于(A)</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>打开数据库(O)...</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>保存数据库(S)</translation>
     </message>
@@ -1473,24 +2514,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>删除群组(D)</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>数据库设置(D)</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>数据库另存为(V)...</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>复制项目(C)</translation>
+        <source>Change &amp;master key...</source>
+        <translation>更改主密码(M),,,</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>动态密码 TOTP</translation>
+        <source>&amp;Database settings</source>
+        <translation>数据库设置(D)</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>复制 TOTP 密码(T)</translation>
+        <source>Database settings</source>
+        <translation>数据库设置</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>显示 TOTP 密码</translation>
+        <source>&amp;Clone entry</source>
+        <translation>复制项目(C)</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1501,14 +2542,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>复制用户名(U)</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>将用户名复制到剪贴板</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>复制密码(Y)</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>将密码复制到剪贴板</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>设置(S)</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>密码生成器</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>执行自动输入(P)</translation>
     </message>
@@ -1525,165 +2578,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>标题(T)</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>网址(U)</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>备注(N)</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>密码生成器</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>清除历史</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>导出为 CSV 文件(E)...</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>数据库(D)</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>导入 KeePass 1 数据库...</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>导入</translation>
+        <source>Import CSV file...</source>
+        <translation>导入 CSV 文件...</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>工具(T)</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>修复数据库(P)...</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>显示 TOTP 密码</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>设置 TOTP 密码...</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>复制 TOTP 密码(T)</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>清空回收站</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>清除历史</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>访问配置文件出错 %1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>退出 KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>请触摸你 YubiKey 上的按键！</translation>
+        <source>read-only</source>
+        <translation>只读</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>帮助(H)</translation>
+        <source>Settings</source>
+        <translation>设置</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>打开数据库(O)...</translation>
+        <source>Toggle window</source>
+        <translation>切换窗口</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>数据库另存为(V)...</translation>
+        <source>Quit KeePassXC</source>
+        <translation>退出 KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>更改主密码(M),,,</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 数据库</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>导出为 CSV 文件(E)...</translation>
+        <source>All files</source>
+        <translation>所有文件</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>导入 KeePass 1 数据库...</translation>
+        <source>Open database</source>
+        <translation>打开数据库</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>导入 CSV 文件...</translation>
+        <source>Save repaired database</source>
+        <translation>保存修复后的数据库</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>修复数据库(P)...</translation>
+        <source>Writing the database failed.</source>
+        <translation>数据库写入失败</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>设置 TOTP 密码...</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>请触摸你 YubiKey 上的按键！</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>对话框</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>常规</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>当请求凭证时显示通知(O)</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>根据用户名排序匹配项(U)</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>从活动数据库的条目中移除已存储的所有权限(M)</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>高级</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>永远允许访问项目(A)</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>永远允许更新项目(U)</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>在所有打开的数据库中查找匹配项目(H)</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP 端口：</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>默认端口：19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>数据库锁定时请求解锁(Q)</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>根据标题排序匹配项(M)</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC 将监听 127.0.0.1 上的此端口</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>无法绑定到特权端口</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>无法绑定低于 1024 的特权端口 ！
-使用默认端口 19455</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>移除所有激活数据库共享的加密密钥(E)</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>返回以“KPH:”开头的高级字符串字段(R)</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>不支持自动创建或更新字符串字段。</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>对话框</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1694,6 +2792,15 @@ Using default port 19455.</source>
         <translation>启用 KeePassHTTP 服务</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>常规</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>当请求凭证时显示通知(O)</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>只返回特定网址的最佳匹配，而不是整个域名的所有条目。</translation>
     </message>
@@ -1702,6 +2809,10 @@ Using default port 19455.</source>
         <translation>只返回最匹配的条目</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>数据库锁定时请求解锁(Q)</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>仅返回具有相同协议 (http://, https://, ftp://, ...) 的条目</translation>
     </message>
@@ -1710,27 +2821,108 @@ Using default port 19455.</source>
         <translation>匹配 URL 协议(M)</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>根据用户名排序匹配项(U)</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>根据标题排序匹配项(M)</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>移除所有激活数据库共享的加密密钥(E)</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>从活动数据库的条目中移除已存储的所有权限(M)</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>密码生成器</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>高级</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>永远允许访问项目(A)</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>永远允许更新项目(U)</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>只有选定的数据库必须与一个客户端连接。</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>以下选项可能很危险！
-除非你知道自己在做什么，否则不要更改这些设置</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>在所有打开的数据库中查找匹配项目(H)</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>不支持自动创建或更新字符串字段。</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>返回以“KPH:”开头的高级字符串字段(R)</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP 端口：</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>默认端口：19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC 将监听 127.0.0.1 上的此端口</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>无法绑定到特权端口</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>无法绑定低于 1024 的特权端口 ！
+使用默认端口 19455</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>密码：</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>强度</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>熵</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>字符类型</translation>
     </message>
@@ -1751,38 +2943,50 @@ Change them only if you know what you are doing.</source>
         <translation>特殊字符</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>扩展 ASCII</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>排除相似的字符</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>接受</translation>
+        <source>Pick characters from every group</source>
+        <translation>包含每一种字符</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>长度(L)︰</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>强度</translation>
+        <source>Passphrase</source>
+        <translation>口令</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>熵</translation>
+        <source>Wordlist:</source>
+        <translation>字符列表：</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>长度(L)︰</translation>
+        <source>Word Count:</source>
+        <translation>字数：</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>包含每一种字符</translation>
+        <source>Word Separator:</source>
+        <translation>字符分隔符：</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>生成</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>复制</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>接受</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>关闭</translation>
     </message>
@@ -1800,51 +3004,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>差</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>弱</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>好</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>优秀</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>密码</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>扩展 ASCII</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>口令</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>字符列表：</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>字数：</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>字符分隔符：</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>复制</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>数据库路径</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>网址</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>提取并打印数据库内容</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>将提取的数据库路径</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>将执行的命令名称</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>列出数据库项目</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>要将列出的群组路径，默认为 /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>合并两个数据库</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>合并成的数据库路径</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>将合并的数据库路径</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>项目名称</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>空设备</translation>
@@ -1868,8 +3291,28 @@ Change them only if you know what you are doing.</source>
         <translation>缺少后引号</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
-        <translation>内部信息 - 未定义的下溢</translation>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation>Argon2（推荐 KDBX 4）</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation>AES-KDF（KDBX 4）</translation>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
+        <translation>AES-KDF（KDBX 3.1）</translation>
     </message>
     <message>
         <source>Group</source>
@@ -1888,14 +3331,22 @@ Change them only if you know what you are doing.</source>
         <translation>密码</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>网址</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>备注</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>浏览器配合</translation>
     </message>
@@ -1911,6 +3362,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation>被动</translation>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1949,8 +3404,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>区分大小写</translation>
+        <source>Search...</source>
+        <translation>搜索……</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1961,8 +3416,8 @@ Change them only if you know what you are doing.</source>
         <translation>清除</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>搜索……</translation>
+        <source>Case Sensitive</source>
+        <translation>区分大小写</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1972,50 +3427,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>一个共享的加密密钥，名为&quot;%1&quot;已存在。
-你想要覆盖它吗？</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>你想更新 %1-%2 中的信息吗？</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>激活的数据库被锁定 ！
-请解锁选定的数据库或选择另一已解锁的数据库。</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>成功移除 %1 加密 - %2 在 KeePassX/Http 设置中。</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>没有在 KeePassHttp 设置中找到共享加密密钥。</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>当前数据库中没有 KeePassHttp 设置的条目。</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>正在删除存储的权限...</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>中断</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>成功移除 %1 %2 的权限。</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>当前数据库中不包含具有权限的条目。</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC: 新的密钥关联请求</translation>
     </message>
@@ -2032,33 +3443,77 @@ give it a unique name to identify and accept it.</source>
         <translation>KeePassXC︰ 覆盖现有的密钥吗？</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>一个共享的加密密钥，名为&quot;%1&quot;已存在。
+你想要覆盖它吗？</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC︰ 更新条目</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>你想更新 %1-%2 中的信息吗？</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC︰ 数据库被锁定 ！</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>激活的数据库被锁定 ！
+请解锁选定的数据库或选择另一已解锁的数据库。</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC︰ 从数据库中删除键</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC︰ 未找到键</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>没有在 KeePassHttp 设置中找到共享加密密钥。</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC︰ 设置不可用 ！</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>当前数据库中没有 KeePassHttp 设置的条目。</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>正在删除存储的权限...</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中断</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC︰ 已删除的权限</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC： 未找到权限的条目！</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>当前数据库中不包含具有权限的条目。</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2082,10 +3537,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>基础设置</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation>只启动一个 KeePassXC 实例</translation>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>记住最近的数据库</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>记住上次的密钥文件和安全模块</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>在启动时加载最近的数据库</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>离开后自动保存</translation>
     </message>
@@ -2094,20 +3565,28 @@ give it a unique name to identify and accept it.</source>
         <translation>修改后自动保存</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>当外部修改时自动重新加载数据库</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>复制到剪贴板后最小化</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>在应用程序启动时窗口最小化</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>新增项目时使用群组图标</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>自动输入全局快捷键</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>不要因非数据的更改而将数据库标记为已修改 （比如增加群组）</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>语言</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2118,66 +3597,60 @@ give it a unique name to identify and accept it.</source>
         <translation>将窗口最小化至任务栏</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>在启动时加载最近的数据库</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>当外部修改时自动重新加载数据库</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>退出时将窗口最小化至任务栏</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>在应用程序启动时窗口最小化</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>基础设置</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>记住上次的密钥文件和安全模块</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>不要因非数据的更改而将数据库标记为已修改 （比如增加群组）</translation>
+        <source>Language</source>
+        <translation>语言</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>自动输入</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>使用项目标题和 URL 来匹配自动输入的窗口</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>总在执行自动输入前询问</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>自动输入全局快捷键</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>自动输入延迟</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>毫秒</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation>只启动一个 KeePassXC 实例</translation>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>超时</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>在多久后清除剪贴板</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>秒</translation>
     </message>
     <message>
@@ -2185,8 +3658,12 @@ give it a unique name to identify and accept it.</source>
         <translation>在多久没有动作之后锁住数据库</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>默认以明码显示密码</translation>
+        <source>Convenience</source>
+        <translation>便利性</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>系统锁定或盖子合上时锁定数据库</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2197,16 +3674,16 @@ give it a unique name to identify and accept it.</source>
         <translation>可见时不需要重复输入密码</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>超时</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>默认以明码显示密码</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>便利性</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>系统锁定或盖子合上时锁定数据库</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2228,6 +3705,14 @@ give it a unique name to identify and accept it.</source>
         <translation>密钥：</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>使用自定义设置</translation>
     </message>
@@ -2253,6 +3738,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation>秒</translation>
     </message>
 </context>
@@ -2320,88 +3806,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>自定义配置文件路径</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>数据库密钥文件</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - 跨平台密码管理软件</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>从标准输入读取数据库的密码</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>将打开的密码数据库文件名(*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>将密码复制到剪贴板</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>数据库路径</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>使用图形界面解锁数据库</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
-        <translation>将复制的项目名称</translation>
-    </message>
-    <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>提取并打印数据库内容</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>将提取的数据库路径</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>将执行的命令名称</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>列出数据库项目</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>要将列出的群组路径，默认为 /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>打印项目和群组的 UUID</translation>
+        <source>Path of the entry to remove.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Merge two databases.</source>
-        <translation>合并两个数据库</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - 跨平台密码管理软件</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>合并成的数据库路径</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>将打开的密码数据库文件名(*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>将合并的数据库路径</translation>
+        <source>path to a custom config file</source>
+        <translation>自定义配置文件路径</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>两个数据库使用相同密码</translation>
+        <source>key file of the database</source>
+        <translation>数据库密钥文件</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>显示密码</translation>
+        <source>read password of the database from stdin</source>
+        <translation>从标准输入读取数据库的密码</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>项目名称</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file
diff --git a/share/translations/keepassx_zh_TW.ts b/share/translations/keepassx_zh_TW.ts
index 54614e5cc..d84b9e0d0 100644
--- a/share/translations/keepassx_zh_TW.ts
+++ b/share/translations/keepassx_zh_TW.ts
@@ -10,14 +10,34 @@
         <translation>關於</translation>
     </message>
     <message>
+        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
+        <translation>回報 Bug 請至：&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
+    </message>
+    <message>
+        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
+        <translation>KeePassXC 遵循 GNU 通用公共許可證 (GPL) 第二版 或（依你的需求）以第三版發行。</translation>
+    </message>
+    <message>
+        <source>Project Maintainers:</source>
+        <translation>專案維護者：</translation>
+    </message>
+    <message>
         <source>Contributors</source>
         <translation>貢獻者</translation>
     </message>
     <message>
+        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
+        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;在 GitHub 上看看有哪些貢獻者&lt;/a&gt;</translation>
+    </message>
+    <message>
         <source>Debug Info</source>
         <translation>除錯資訊</translation>
     </message>
     <message>
+        <source>Include the following information whenever you report a bug:</source>
+        <translation>回報 Bug 時會包含以下資訊：</translation>
+    </message>
+    <message>
         <source>Copy to clipboard</source>
         <translation>複製到剪貼簿</translation>
     </message>
@@ -32,6 +52,10 @@
         <translation>修訂：%1</translation>
     </message>
     <message>
+        <source>Distribution: %1</source>
+        <translation>散佈：%1</translation>
+    </message>
+    <message>
         <source>Libraries:</source>
         <translation>函式庫：</translation>
     </message>
@@ -47,34 +71,14 @@ Kernel: %3 %4</source>
         <source>Enabled extensions:</source>
         <translation>已啟用的擴充元件：</translation>
     </message>
-    <message>
-        <source>Report bugs at: &lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</source>
-        <translation>回報 Bug 請至：&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/issues&quot; style=&quot;text-decoration: underline;&quot;&gt;https://github.com&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>KeePassXC is distributed under the terms of the GNU General Public License (GPL) version 2 or (at your option) version 3.</source>
-        <translation>KeePassXC 遵循 GNU 通用公共許可證 (GPL) 第二版 或（依你的需求）以第三版發行。</translation>
-    </message>
-    <message>
-        <source>Project Maintainers:</source>
-        <translation>專案維護者：</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;See Contributions on GitHub&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://github.com/keepassxreboot/keepassxc/graphs/contributors&quot;&gt;在 GitHub 上看看有哪些貢獻者&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Include the following information whenever you report a bug:</source>
-        <translation>回報 Bug 時會包含以下資訊：</translation>
-    </message>
-    <message>
-        <source>Distribution: %1</source>
-        <translation>散佈：%1</translation>
-    </message>
 </context>
 <context>
     <name>AccessControlDialog</name>
     <message>
+        <source>KeePassXC HTTP Confirm Access</source>
+        <translation>KeePassXC HTTP 確認存取</translation>
+    </message>
+    <message>
         <source>Remember this decision</source>
         <translation>記住此決定</translation>
     </message>
@@ -92,9 +96,12 @@ Please select whether you want to allow access.</source>
         <translation>%1 要求存取下列項目的密碼。
 請選擇是否允許存取。</translation>
     </message>
+</context>
+<context>
+    <name>AgentSettingsWidget</name>
     <message>
-        <source>KeePassXC HTTP Confirm Access</source>
-        <translation>KeePassXC HTTP 確認存取</translation>
+        <source>Enable SSH Agent (requires restart)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -107,6 +114,26 @@ Please select whether you want to allow access.</source>
         <source>Auto-Type - KeePassXC</source>
         <translation>自動輸入 - KeePassXC</translation>
     </message>
+    <message>
+        <source>Auto-Type</source>
+        <translation>自動輸入</translation>
+    </message>
+    <message>
+        <source>The Syntax of your Auto-Type statement is incorrect!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains a very long delay. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains very slow key presses. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>This Auto-Type command contains arguments which are repeated very often. Do you really want to proceed?</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>AutoTypeAssociationsModel</name>
@@ -126,12 +153,289 @@ Please select whether you want to allow access.</source>
 <context>
     <name>AutoTypeSelectDialog</name>
     <message>
+        <source>Auto-Type - KeePassXC</source>
+        <translation>自動輸入 - KeePassXC</translation>
+    </message>
+    <message>
         <source>Select entry to Auto-Type:</source>
         <translation>選擇要自動輸入的項目</translation>
     </message>
+</context>
+<context>
+    <name>BrowserAccessControlDialog</name>
     <message>
-        <source>Auto-Type - KeePassXC</source>
-        <translation>自動輸入 - KeePassXC</translation>
+        <source>KeePassXC-Browser Confirm Access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remember this decision</source>
+        <translation>記住此決定</translation>
+    </message>
+    <message>
+        <source>Allow</source>
+        <translation>允許</translation>
+    </message>
+    <message>
+        <source>Deny</source>
+        <translation>禁止</translation>
+    </message>
+    <message>
+        <source>%1 has requested access to passwords for the following item(s).
+Please select whether you want to allow access.</source>
+        <translation>%1 要求存取下列項目的密碼。
+請選擇是否允許存取。</translation>
+    </message>
+</context>
+<context>
+    <name>BrowserOptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>對話方塊</translation>
+    </message>
+    <message>
+        <source>This is required for accessing your databases with KeePassXC-Browser</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enable KeepassXC browser integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Enable integration for these browsers:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Google Chrome</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Firefox</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Chromium</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Vivaldi</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show a &amp;notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>若資料庫已鎖定，則請求解鎖 (&amp;Q)</translation>
+    </message>
+    <message>
+        <source>Only entries with the same scheme (http://, https://, ...) are returned.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Match URL scheme (e.g., https://...)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
+        <translation>只回傳最佳的網址相符項目而非所有網址相符的項目。(&amp;R)</translation>
+    </message>
+    <message>
+        <source>&amp;Return only best-matching credentials</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort &amp;matching credentials by title</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Sort matching credentials by &amp;username</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&amp;Disconnect all browsers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Forget all remembered &amp;permissions</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Advanced</source>
+        <translation>進階</translation>
+    </message>
+    <message>
+        <source>Never &amp;ask before accessing credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Never ask before &amp;updating credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Only the selected database has to be connected with a client.</source>
+        <translation>只有所選的資料庫能連接到客戶端。</translation>
+    </message>
+    <message>
+        <source>Searc&amp;h in all opened databases for matching credentials</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>不支援自動建立或更新文字欄位。</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>回傳 「KPH: 」 起首的進階文字欄位 (&amp;R)</translation>
+    </message>
+    <message>
+        <source>Updates KeePassXC or keepassxc-proxy binary path automatically to native messaging scripts on startup.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Update &amp;native messaging manifest files at startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Support a proxy application between KeePassXC and browser extension.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;proxy application between KeePassXC and browser extension</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a custom proxy location if you installed a proxy manually.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use a &amp;custom proxy location</source>
+        <comment>Meant is the proxy for KeePassXC-Browser</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*.exe);;All Files (*.*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Executable Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select custom proxy location</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BrowserService</name>
+    <message>
+        <source>KeePassXC: New key association request</source>
+        <translation>KeePassXC：新的金鑰關聯請求</translation>
+    </message>
+    <message>
+        <source>You have received an association request for the above key.
+
+If you would like to allow it access to your KeePassXC database,
+give it a unique name to identify and accept it.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Save and allow access</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Overwrite existing key?</source>
+        <translation>KeePassXC：覆蓋現有的金鑰？</translation>
+    </message>
+    <message>
+        <source>A shared encryption key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Update Entry</source>
+        <translation>KeePassXC：更新項目</translation>
+    </message>
+    <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>更新 %1 到 %2 的資訊？</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Database locked!</source>
+        <translation>KeePassXC：資料庫已鎖定！</translation>
+    </message>
+    <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>目前的資料庫已鎖定！
+請解鎖所選的資料庫或選擇其他已解鎖的資料庫。</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Settings not available!</source>
+        <translation>KeePassXC：設定不可用！</translation>
+    </message>
+    <message>
+        <source>The active database does not contain a settings entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: No keys found</source>
+        <translation>KeePassXC：找不到金鑰</translation>
+    </message>
+    <message>
+        <source>No shared encryption keys found in KeePassXC Settings.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC: Removed keys from database</source>
+        <translation>KeePassXC：從資料庫中移除金鑰</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption key(s) from KeePassXC settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Removing stored permissions…</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
+        <source>KeePassXC: Removed permissions</source>
+        <translation>KeePassXC：已移除權限</translation>
+    </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entry(s).</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>KeePassXC: No entry with permissions found!</source>
+        <translation>KeePassXC：找不到帶有權限的項目！</translation>
+    </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>目前的資料庫中沒有帶有權限的項目。</translation>
     </message>
 </context>
 <context>
@@ -149,6 +453,10 @@ Please select whether you want to allow access.</source>
         <translation>再次輸入密碼：</translation>
     </message>
     <message>
+        <source>&amp;Key file</source>
+        <translation>金鑰檔案 (&amp;K)</translation>
+    </message>
+    <message>
         <source>Browse</source>
         <translation>瀏覽</translation>
     </message>
@@ -157,6 +465,14 @@ Please select whether you want to allow access.</source>
         <translation>建立</translation>
     </message>
     <message>
+        <source>Cha&amp;llenge Response</source>
+        <translation>挑戰回應</translation>
+    </message>
+    <message>
+        <source>Refresh</source>
+        <translation>重新整理</translation>
+    </message>
+    <message>
         <source>Key files</source>
         <translation>金鑰檔案</translation>
     </message>
@@ -177,6 +493,10 @@ Please select whether you want to allow access.</source>
         <translation>選擇金鑰檔案</translation>
     </message>
     <message>
+        <source>Empty password</source>
+        <translation>清空密碼</translation>
+    </message>
+    <message>
         <source>Do you really want to use an empty string as password?</source>
         <translation>真的要使用空白密碼？</translation>
     </message>
@@ -191,20 +511,15 @@ Please select whether you want to allow access.</source>
 %2</translation>
     </message>
     <message>
-        <source>&amp;Key file</source>
-        <translation>金鑰檔案 (&amp;K)</translation>
-    </message>
-    <message>
-        <source>Cha&amp;llenge Response</source>
-        <translation>挑戰回應</translation>
-    </message>
-    <message>
-        <source>Refresh</source>
-        <translation>重新整理</translation>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Empty password</source>
-        <translation>清空密碼</translation>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changing master key failed: no YubiKey inserted.</source>
@@ -218,6 +533,10 @@ Please select whether you want to allow access.</source>
         <translation>複製選項</translation>
     </message>
     <message>
+        <source>Append &apos; - Clone&apos; to title</source>
+        <translation>在標題後追加「 - 複製」字樣</translation>
+    </message>
+    <message>
         <source>Replace username and password with references</source>
         <translation>以引用資料取代使用者名稱與密碼</translation>
     </message>
@@ -225,10 +544,6 @@ Please select whether you want to allow access.</source>
         <source>Copy history</source>
         <translation>複製歷史記錄</translation>
     </message>
-    <message>
-        <source>Append &apos; - Clone&apos; to title</source>
-        <translation>在標題後追加「 - 複製」字樣</translation>
-    </message>
 </context>
 <context>
     <name>CsvImportWidget</name>
@@ -326,10 +641,6 @@ Please select whether you want to allow access.</source>
 <context>
     <name>CsvImportWizard</name>
     <message>
-        <source>Import CSV file</source>
-        <translation>匯入 CSV 檔</translation>
-    </message>
-    <message>
         <source>Error</source>
         <translation>錯誤</translation>
     </message>
@@ -340,17 +651,17 @@ Please select whether you want to allow access.</source>
 </context>
 <context>
     <name>CsvParserModel</name>
-    <message>
-        <source> byte, </source>
-        <translation> 位元組， </translation>
+    <message numerus="yes">
+        <source>%n byte(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> rows, </source>
-        <translation> 行， </translation>
+    <message numerus="yes">
+        <source>%n row(s), </source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
-    <message>
-        <source> columns</source>
-        <translation> 列</translation>
+    <message numerus="yes">
+        <source>%n column(s)</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -372,6 +683,14 @@ Please select whether you want to allow access.</source>
         <translation>瀏覽</translation>
     </message>
     <message>
+        <source>Refresh</source>
+        <translation>重新整理</translation>
+    </message>
+    <message>
+        <source>Challenge Response:</source>
+        <translation>挑戰驗證：</translation>
+    </message>
+    <message>
         <source>Unable to open the database.</source>
         <translation>無法開啟資料庫。</translation>
     </message>
@@ -380,6 +699,21 @@ Please select whether you want to allow access.</source>
         <translation>無法開啟金鑰檔案</translation>
     </message>
     <message>
+        <source>Legacy key file format</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Don&apos;t show this warning again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>All files</source>
         <translation>所有檔案</translation>
     </message>
@@ -391,14 +725,6 @@ Please select whether you want to allow access.</source>
         <source>Select key file</source>
         <translation>選擇金鑰檔案</translation>
     </message>
-    <message>
-        <source>Refresh</source>
-        <translation>重新整理</translation>
-    </message>
-    <message>
-        <source>Challenge Response:</source>
-        <translation>挑戰驗證：</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseRepairWidget</name>
@@ -415,14 +741,14 @@ Please select whether you want to allow access.</source>
         <translation>無法開啟金鑰檔案</translation>
     </message>
     <message>
-        <source>Database opened fine. Nothing to do.</source>
-        <translation>資料庫正常開啟。什麼都不做。</translation>
-    </message>
-    <message>
         <source>Unable to open the database.</source>
         <translation>無法開啟資料庫。</translation>
     </message>
     <message>
+        <source>Database opened fine. Nothing to do.</source>
+        <translation>資料庫正常開啟。什麼都不做。</translation>
+    </message>
+    <message>
         <source>Success</source>
         <translation>成功</translation>
     </message>
@@ -439,40 +765,57 @@ You can now save it.</source>
 <context>
     <name>DatabaseSettingsWidget</name>
     <message>
-        <source>Database name:</source>
-        <translation>資料庫名稱：</translation>
+        <source>General</source>
+        <translation>一般</translation>
     </message>
     <message>
-        <source>Database description:</source>
-        <translation>資料庫描述：</translation>
+        <source>Encryption</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Transform rounds:</source>
-        <translation>加密轉換次數：</translation>
+        <source>Number of rounds too high</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default username:</source>
-        <translation>預設的使用者名稱：</translation>
+        <source>You are using a very high number of key transform rounds with Argon2.
+
+If you keep this number, your database may take hours or days (or even longer) to open!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source> MiB</source>
-        <translation> MiB</translation>
+        <source>Understood, keep number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Benchmark</source>
-        <translation>效能測試</translation>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history items:</source>
-        <translation>最大歷史記錄項目：</translation>
+        <source>Number of rounds too low</source>
+        <comment>Key transformation rounds</comment>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Max. history size:</source>
-        <translation>最大歷史記錄大小：</translation>
+        <source>You are using a very low number of key transform rounds with AES-KDF.
+
+If you keep this number, your database may be too easy to crack!</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Use recycle bin</source>
-        <translation>使用回收桶</translation>
+        <source>KDF unchanged</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to transform key with new KDF parameters; KDF unchanged.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetEncryption</name>
+    <message>
+        <source>Encryption Algorithm:</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>AES:  256 Bit   (default)</source>
@@ -483,14 +826,78 @@ You can now save it.</source>
         <translation>Twofish：256 位元</translation>
     </message>
     <message>
-        <source>Algorithm:</source>
-        <translation>演算法：</translation>
+        <source>Key Derivation Function:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Transform rounds:</source>
+        <translation>加密轉換次數：</translation>
+    </message>
+    <message>
+        <source>Benchmark 1-second delay</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Memory Usage:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> MB</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Parallelism:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> thread</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DatabaseSettingsWidgetGeneral</name>
+    <message>
+        <source>Database Meta Data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Database name:</source>
+        <translation>資料庫名稱：</translation>
+    </message>
+    <message>
+        <source>Database description:</source>
+        <translation>資料庫描述：</translation>
+    </message>
+    <message>
+        <source>Default username:</source>
+        <translation>預設的使用者名稱：</translation>
+    </message>
+    <message>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Max. history items:</source>
+        <translation>最大歷史記錄項目：</translation>
+    </message>
+    <message>
+        <source>Max. history size:</source>
+        <translation>最大歷史記錄大小：</translation>
+    </message>
+    <message>
+        <source> MiB</source>
+        <translation> MiB</translation>
+    </message>
+    <message>
+        <source>Use recycle bin</source>
+        <translation>使用回收桶</translation>
     </message>
 </context>
 <context>
     <name>DatabaseTabWidget</name>
     <message>
         <source>Root</source>
+        <comment>Root group</comment>
         <translation>根</translation>
     </message>
     <message>
@@ -510,22 +917,48 @@ You can now save it.</source>
         <translation>找不到檔案！</translation>
     </message>
     <message>
-        <source>Open KeePass 1 database</source>
-        <translation>開啟 KeePass 1 資料庫</translation>
+        <source>Unable to open the database.</source>
+        <translation>無法開啟資料庫。</translation>
     </message>
     <message>
-        <source>KeePass 1 database</source>
-        <translation>KeePass 1 資料庫</translation>
+        <source>File opened in read only mode.</source>
+        <translation>已將檔案以唯讀模式開啟。</translation>
+    </message>
+    <message>
+        <source>Open CSV file</source>
+        <translation>開啟 CSV 檔</translation>
+    </message>
+    <message>
+        <source>CSV file</source>
+        <translation>CSV 檔案</translation>
     </message>
     <message>
         <source>All files (*)</source>
         <translation>所有檔案 (*)</translation>
     </message>
     <message>
+        <source>Merge database</source>
+        <translation>合併資料庫</translation>
+    </message>
+    <message>
+        <source>Open KeePass 1 database</source>
+        <translation>開啟 KeePass 1 資料庫</translation>
+    </message>
+    <message>
+        <source>KeePass 1 database</source>
+        <translation>KeePass 1 資料庫</translation>
+    </message>
+    <message>
         <source>Close?</source>
         <translation>關閉？</translation>
     </message>
     <message>
+        <source>&quot;%1&quot; is in edit mode.
+Discard changes and close anyway?</source>
+        <translation>「%1」 正在編輯模式中。
+是否要捨棄變更並關閉？</translation>
+    </message>
+    <message>
         <source>Save changes?</source>
         <translation>儲存修改？</translation>
     </message>
@@ -540,12 +973,24 @@ Save changes?</source>
         <translation>寫入資料庫失敗。</translation>
     </message>
     <message>
+        <source>Passwords</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
         <source>Save database as</source>
         <translation>資料庫另存為</translation>
     </message>
     <message>
+        <source>Export database to CSV file</source>
+        <translation>將資料庫輸出成 CSV 檔案</translation>
+    </message>
+    <message>
+        <source>Writing the CSV file failed.</source>
+        <translation>寫入 CSV 檔案失敗。</translation>
+    </message>
+    <message>
         <source>New database</source>
-        <translation>新的資料庫</translation>
+        <translation>新增資料庫</translation>
     </message>
     <message>
         <source>locked</source>
@@ -562,12 +1007,6 @@ Please press cancel to finish your changes or discard them.</source>
 請按取消以完成修改或捨棄修改。</translation>
     </message>
     <message>
-        <source>This database has never been saved.
-You can save the database or stop locking it.</source>
-        <translation>資料庫尚未儲存。
-可以先儲存資料庫或是停止鎖定資料庫</translation>
-    </message>
-    <message>
         <source>This database has been modified.
 Do you want to save the database before locking it?
 Otherwise your changes are lost.</source>
@@ -575,70 +1014,14 @@ Otherwise your changes are lost.</source>
 要在鎖定之前儲存資料庫？
 不然則會遺失所有修改。</translation>
     </message>
-    <message>
-        <source>&quot;%1&quot; is in edit mode.
-Discard changes and close anyway?</source>
-        <translation>「%1」 正在編輯模式中。
-是否要捨棄變更並關閉？</translation>
-    </message>
-    <message>
-        <source>Export database to CSV file</source>
-        <translation>將資料庫輸出成 CSV 檔案</translation>
-    </message>
-    <message>
-        <source>CSV file</source>
-        <translation>CSV 檔案</translation>
-    </message>
-    <message>
-        <source>Writing the CSV file failed.</source>
-        <translation>寫入 CSV 檔案失敗。</translation>
-    </message>
-    <message>
-        <source>Unable to open the database.</source>
-        <translation>無法開啟資料庫。</translation>
-    </message>
-    <message>
-        <source>Merge database</source>
-        <translation>合併資料庫</translation>
-    </message>
-    <message>
-        <source>The database you are trying to save as is locked by another instance of KeePassXC.
-Do you want to save it anyway?</source>
-        <translation>欲儲存的資料庫已由其他 KeePassXC 程式鎖定。
-仍要繼續儲存？</translation>
-    </message>
-    <message>
-        <source>Passwords</source>
-        <translation>密碼</translation>
-    </message>
-    <message>
-        <source>Database already opened</source>
-        <translation>資料庫已開啟</translation>
-    </message>
-    <message>
-        <source>The database you are trying to open is locked by another instance of KeePassXC.
-
-Do you want to open it anyway?</source>
-        <translation>欲開啟的資料庫已由其他 KeePassXC 程式鎖定。
-
-仍要繼續開啟？</translation>
-    </message>
-    <message>
-        <source>Open read-only</source>
-        <translation>以唯讀模式開啟</translation>
-    </message>
-    <message>
-        <source>File opened in read only mode.</source>
-        <translation>已將檔案以唯讀模式開啟。</translation>
-    </message>
-    <message>
-        <source>Open CSV file</source>
-        <translation>開啟 CSV 檔</translation>
-    </message>
 </context>
 <context>
     <name>DatabaseWidget</name>
     <message>
+        <source>Searching...</source>
+        <translation>搜尋中……</translation>
+    </message>
+    <message>
         <source>Change master key</source>
         <translation>變更主金鑰</translation>
     </message>
@@ -659,36 +1042,44 @@ Do you want to open it anyway?</source>
         <translation>真的要永久刪除 %1 個項目？</translation>
     </message>
     <message>
+        <source>Move entry to recycle bin?</source>
+        <translation>將項目移到回收桶？</translation>
+    </message>
+    <message>
+        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
+        <translation>真的要將「%1」移到回收桶？</translation>
+    </message>
+    <message>
         <source>Move entries to recycle bin?</source>
         <translation>將項目移到回收桶？</translation>
     </message>
     <message numerus="yes">
         <source>Do you really want to move %n entry(s) to the recycle bin?</source>
-        <translation><numerusform>真的要將 %n 個項目移到回收桶？</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
-        <source>Delete group?</source>
-        <translation>刪除群組？</translation>
+        <source>Execute command?</source>
+        <translation>執行命令？</translation>
     </message>
     <message>
-        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
-        <translation>真的要永遠刪除「%1」群組？</translation>
+        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
+        <translation>真的要執行下列命令？&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <source>Remember my choice</source>
+        <translation>記住我的選擇</translation>
     </message>
     <message>
-        <source>Move entry to recycle bin?</source>
-        <translation>將項目移到回收桶？</translation>
+        <source>Delete group?</source>
+        <translation>刪除群組？</translation>
     </message>
     <message>
-        <source>Do you really want to move entry &quot;%1&quot; to the recycle bin?</source>
-        <translation>真的要將「%1」移到回收桶？</translation>
+        <source>Do you really want to delete the group &quot;%1&quot; for good?</source>
+        <translation>真的要永遠刪除「%1」群組？</translation>
     </message>
     <message>
-        <source>Searching...</source>
-        <translation>搜尋中……</translation>
+        <source>Unable to calculate master key</source>
+        <translation>無法計算主金鑰</translation>
     </message>
     <message>
         <source>No current database.</source>
@@ -707,20 +1098,8 @@ Do you want to open it anyway?</source>
         <translation>無結果</translation>
     </message>
     <message>
-        <source>Execute command?</source>
-        <translation>執行命令？</translation>
-    </message>
-    <message>
-        <source>Do you really want to execute the following command?&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</source>
-        <translation>真的要執行下列命令？&lt;br&gt;&lt;br&gt;%1&lt;br&gt;</translation>
-    </message>
-    <message>
-        <source>Remember my choice</source>
-        <translation>記住我的選擇</translation>
-    </message>
-    <message>
-        <source>Autoreload Request</source>
-        <translation>自動重新讀取請求</translation>
+        <source>File has changed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The database file has changed. Do you want to load the changes?</source>
@@ -731,8 +1110,9 @@ Do you want to open it anyway?</source>
         <translation>合併請求</translation>
     </message>
     <message>
-        <source>The database file has changed and you have unsaved changes.Do you want to merge your changes?</source>
-        <translation>資料庫檔案已變更，且有尚未儲存的變更。合併變更？</translation>
+        <source>The database file has changed and you have unsaved changes.
+Do you want to merge your changes?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Could not open the new database file while attempting to autoreload this database.</source>
@@ -748,6 +1128,89 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>DetailsWidget</name>
+    <message>
+        <source>Generate TOTP Token</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Close</source>
+        <translation>關閉</translation>
+    </message>
+    <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>網址</translation>
+    </message>
+    <message>
+        <source>Expiration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username</source>
+        <translation>使用者名稱</translation>
+    </message>
+    <message>
+        <source>Autotype</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Searching</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attributes</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
+    <message>
+        <source>Notes</source>
+        <translation>附註</translation>
+    </message>
+    <message>
+        <source>Window</source>
+        <translation>視窗</translation>
+    </message>
+    <message>
+        <source>Sequence</source>
+        <translation>序列</translation>
+    </message>
+    <message>
+        <source>Search</source>
+        <translation>搜尋</translation>
+    </message>
+    <message>
+        <source>Clear</source>
+        <translation>清除</translation>
+    </message>
+    <message>
+        <source>Never</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Disabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Enabled</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EditEntryWidget</name>
     <message>
         <source>Entry</source>
@@ -774,6 +1237,30 @@ Do you want to open it anyway?</source>
         <translation>歷史記錄</translation>
     </message>
     <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>(encrypted)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Select private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>File too large to be a private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Entry history</source>
         <translation>項目歷史記錄</translation>
     </message>
@@ -794,22 +1281,20 @@ Do you want to open it anyway?</source>
         <translation>新的屬性</translation>
     </message>
     <message>
-        <source>Select file</source>
-        <translation>選擇檔案</translation>
+        <source>Confirm Remove</source>
+        <translation>確認移除</translation>
     </message>
     <message>
-        <source>Unable to open file</source>
-        <translation>無法開啟檔案</translation>
+        <source>Are you sure you want to remove this attribute?</source>
+        <translation>確定要移除此屬性？</translation>
     </message>
     <message>
-        <source>Save attachment</source>
-        <translation>儲存附件</translation>
+        <source>[PROTECTED]</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to save the attachment:
-</source>
-        <translation>無法儲存附件：
-</translation>
+        <source>Press reveal to view or edit</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tomorrow</source>
@@ -817,32 +1302,16 @@ Do you want to open it anyway?</source>
     </message>
     <message numerus="yes">
         <source>%n week(s)</source>
-        <translation><numerusform>%n 個禮拜</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n month(s)</source>
-        <translation><numerusform>%n 個月</numerusform></translation>
+        <translation type="unfinished"><numerusform></numerusform></translation>
     </message>
     <message>
         <source>1 year</source>
         <translation>1 年</translation>
     </message>
-    <message>
-        <source>Confirm Remove</source>
-        <translation>確認移除</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attribute?</source>
-        <translation>確定要移除此屬性？</translation>
-    </message>
-    <message>
-        <source>[PROTECTED] Press reveal to view or edit</source>
-        <translation>[受保護的內容] 請按「揭示」以檢視或編輯</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to remove this attachment?</source>
-        <translation>確定要移除此附件？</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetAdvanced</name>
@@ -859,18 +1328,6 @@ Do you want to open it anyway?</source>
         <translation>移除</translation>
     </message>
     <message>
-        <source>Attachments</source>
-        <translation>附件</translation>
-    </message>
-    <message>
-        <source>Save</source>
-        <translation>儲存</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>開啟</translation>
-    </message>
-    <message>
         <source>Edit Name</source>
         <translation>編輯名稱</translation>
     </message>
@@ -882,6 +1339,10 @@ Do you want to open it anyway?</source>
         <source>Reveal</source>
         <translation>揭示</translation>
     </message>
+    <message>
+        <source>Attachments</source>
+        <translation>附件</translation>
+    </message>
 </context>
 <context>
     <name>EditEntryWidgetAutoType</name>
@@ -890,6 +1351,18 @@ Do you want to open it anyway?</source>
         <translation>啟用此項目的自動輸入</translation>
     </message>
     <message>
+        <source>Inherit default Auto-Type sequence from the &amp;group</source>
+        <translation>從群組中繼承預設的自動輸入序列 (&amp;G)</translation>
+    </message>
+    <message>
+        <source>&amp;Use custom Auto-Type sequence:</source>
+        <translation>使用自訂的自動輸入序列 (&amp;U)：</translation>
+    </message>
+    <message>
+        <source>Window Associations</source>
+        <translation>視窗關聯</translation>
+    </message>
+    <message>
         <source>+</source>
         <translation>+</translation>
     </message>
@@ -902,14 +1375,6 @@ Do you want to open it anyway?</source>
         <translation>視窗標題：</translation>
     </message>
     <message>
-        <source>Inherit default Auto-Type sequence from the &amp;group</source>
-        <translation>從群組中繼承預設的自動輸入序列 (&amp;G)</translation>
-    </message>
-    <message>
-        <source>&amp;Use custom Auto-Type sequence:</source>
-        <translation>使用自訂的自動輸入序列 (&amp;U)：</translation>
-    </message>
-    <message>
         <source>Use default se&amp;quence</source>
         <translation>使用預設序列 (&amp;Q)</translation>
     </message>
@@ -917,10 +1382,6 @@ Do you want to open it anyway?</source>
         <source>Set custo&amp;m sequence:</source>
         <translation>設定自訂序列 (&amp;M)：</translation>
     </message>
-    <message>
-        <source>Window Associations</source>
-        <translation>視窗關聯</translation>
-    </message>
 </context>
 <context>
     <name>EditEntryWidgetHistory</name>
@@ -944,12 +1405,8 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditEntryWidgetMain</name>
     <message>
-        <source>Title:</source>
-        <translation>標題：</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>使用者名稱：</translation>
+        <source>URL:</source>
+        <translation>網址：</translation>
     </message>
     <message>
         <source>Password:</source>
@@ -960,20 +1417,104 @@ Do you want to open it anyway?</source>
         <translation>重複：</translation>
     </message>
     <message>
-        <source>URL:</source>
-        <translation>網址：</translation>
+        <source>Title:</source>
+        <translation>標題：</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>過期</translation>
+        <source>Notes</source>
+        <translation>附註</translation>
     </message>
     <message>
         <source>Presets</source>
         <translation>預設</translation>
     </message>
     <message>
-        <source>Notes:</source>
-        <translation>附註：</translation>
+        <source>Toggle the checkbox to reveal the notes section.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username:</source>
+        <translation>使用者名稱：</translation>
+    </message>
+    <message>
+        <source>Expires</source>
+        <translation>過期</translation>
+    </message>
+</context>
+<context>
+    <name>EditEntryWidgetSSHAgent</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent after</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source> seconds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Fingerprint</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove key from agent when database is closed/locked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add key to agent when database is opened/unlocked</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Comment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Decrypt</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>n/a</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy to clipboard</source>
+        <translation>複製到剪貼簿</translation>
+    </message>
+    <message>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>External file</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Browse...</source>
+        <extracomment>Button for opening file dialog</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Attachment</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add to agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Remove from agent</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Require user confirmation when this key is used</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1045,6 +1586,14 @@ Do you want to open it anyway?</source>
 <context>
     <name>EditWidgetIcons</name>
     <message>
+        <source>&amp;Use default icon</source>
+        <translation>使用預設圖示 (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Use custo&amp;m icon</source>
+        <translation>使用自訂圖示 (&amp;M)</translation>
+    </message>
+    <message>
         <source>Add custom icon</source>
         <translation>加入自訂圖示</translation>
     </message>
@@ -1053,6 +1602,18 @@ Do you want to open it anyway?</source>
         <translation>刪除自訂圖示</translation>
     </message>
     <message>
+        <source>Download favicon</source>
+        <translation>下載圖示</translation>
+    </message>
+    <message>
+        <source>Unable to fetch favicon.</source>
+        <translation>無法擷取圖示。</translation>
+    </message>
+    <message>
+        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
+        <translation>提示：可以啟用 Google 當作備案。選項請至 工具&gt;設定&gt;安全性</translation>
+    </message>
+    <message>
         <source>Images</source>
         <translation>圖片</translation>
     </message>
@@ -1065,24 +1626,12 @@ Do you want to open it anyway?</source>
         <translation>選擇圖片</translation>
     </message>
     <message>
-        <source>Download favicon</source>
-        <translation>下載圖示</translation>
-    </message>
-    <message>
-        <source>Unable to fetch favicon.</source>
-        <translation>無法擷取圖示。</translation>
-    </message>
-    <message>
         <source>Can&apos;t read icon</source>
         <translation>無法讀取圖示</translation>
     </message>
     <message>
-        <source>&amp;Use default icon</source>
-        <translation>使用預設圖示 (&amp;U)</translation>
-    </message>
-    <message>
-        <source>Use custo&amp;m icon</source>
-        <translation>使用自訂圖示 (&amp;M)</translation>
+        <source>Custom icon already exists</source>
+        <translation>自訂圖示已經存在</translation>
     </message>
     <message>
         <source>Confirm Delete</source>
@@ -1092,14 +1641,6 @@ Do you want to open it anyway?</source>
         <source>This icon is used by %1 entries, and will be replaced by the default icon. Are you sure you want to delete it?</source>
         <translation>有 %1 個項目使用此圖示，並將以預設圖示取代。確定要刪除圖示？</translation>
     </message>
-    <message>
-        <source>Hint: You can enable Google as a fallback under Tools&gt;Settings&gt;Security</source>
-        <translation>提示：可以啟用 Google 當作備案。選項請至 工具&gt;設定&gt;安全性</translation>
-    </message>
-    <message>
-        <source>Custom icon already exists</source>
-        <translation>自訂圖示已經存在</translation>
-    </message>
 </context>
 <context>
     <name>EditWidgetProperties</name>
@@ -1124,10 +1665,94 @@ Do you want to open it anyway?</source>
     <name>Entry</name>
     <message>
         <source> - Clone</source>
+        <comment>Suffix added to cloned entries</comment>
         <translation> - 複製</translation>
     </message>
 </context>
 <context>
+    <name>EntryAttachmentsModel</name>
+    <message>
+        <source>Name</source>
+        <translation>名稱</translation>
+    </message>
+    <message>
+        <source>Size</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>EntryAttachmentsWidget</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add</source>
+        <translation>加入</translation>
+    </message>
+    <message>
+        <source>Remove</source>
+        <translation>移除</translation>
+    </message>
+    <message>
+        <source>Open</source>
+        <translation>開啟</translation>
+    </message>
+    <message>
+        <source>Save</source>
+        <translation>儲存</translation>
+    </message>
+    <message>
+        <source>Select files</source>
+        <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+        <source>Are you sure you want to remove %n attachment(s)?</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
+    <message>
+        <source>Confirm Remove</source>
+        <translation>確認移除</translation>
+    </message>
+    <message>
+        <source>Save attachments</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to create directory:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Are you sure you want to overwrite the existing file &quot;%1&quot; with the attachment?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Confirm overwrite</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to save attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachment:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open attachments:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to open files:
+%1</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>EntryAttributesModel</name>
     <message>
         <source>Name</source>
@@ -1156,6 +1781,11 @@ Do you want to open it anyway?</source>
 <context>
     <name>EntryModel</name>
     <message>
+        <source>Ref: </source>
+        <comment>Reference abbreviation</comment>
+        <translation>引用： </translation>
+    </message>
+    <message>
         <source>Group</source>
         <translation>群組</translation>
     </message>
@@ -1171,11 +1801,6 @@ Do you want to open it anyway?</source>
         <source>URL</source>
         <translation>網址</translation>
     </message>
-    <message>
-        <source>Ref: </source>
-        <comment>Reference abbreviation</comment>
-        <translation>引用： </translation>
-    </message>
 </context>
 <context>
     <name>Group</name>
@@ -1185,6 +1810,17 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>HostInstaller</name>
+    <message>
+        <source>KeePassXC: Cannot save file!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot save the native messaging script file.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>HttpPasswordGeneratorWidget</name>
     <message>
         <source>Length:</source>
@@ -1247,6 +1883,361 @@ Do you want to open it anyway?</source>
     </message>
 </context>
 <context>
+    <name>Kdbx3Reader</name>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>無法計算主金鑰</translation>
+    </message>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt.</source>
+        <translation>金鑰不正確或是資料庫損壞。</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx3Writer</name>
+    <message>
+        <source>Unable to issue challenge-response.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>無法計算主金鑰</translation>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Reader</name>
+    <message>
+        <source>missing database headers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>無法計算主金鑰</translation>
+    </message>
+    <message>
+        <source>Invalid header checksum size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Header SHA256 mismatch</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Wrong key or database file is corrupt. (HMAC mismatch)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid header data length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to open buffer for KDF parameters in header</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported key derivation function (KDF) or invalid parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy header fields found in KDBX4 file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header field length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner header binary size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported KeePass variant map version.</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry name data</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry value data</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Bool entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt32 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map Int64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map UInt64 entry value length</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map entry type</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid variant map field type size</source>
+        <extracomment>Translation: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>Kdbx4Writer</name>
+    <message>
+        <source>Invalid symmetric cipher algorithm.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid symmetric cipher IV size.</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to calculate master key</source>
+        <translation>無法計算主金鑰</translation>
+    </message>
+    <message>
+        <source>Failed to serialize KDF parameters variant map</source>
+        <extracomment>Translation comment: variant map = data structure for storing meta data</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxReader</name>
+    <message>
+        <source>Invalid cipher uuid length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid compression flags length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unsupported compression algorithm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid master seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform rounds size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid start bytes size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid random stream id size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid inner random stream cipher</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Not a KeePass database.</source>
+        <translation>並非 KeePass 資料庫。</translation>
+    </message>
+    <message>
+        <source>The selected file is an old KeePass 1 database (.kdb).
+
+You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
+This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
+        <translation>選擇的檔案是舊的 KeePass 1 資料庫 (.kdb)。
+
+你可以點選 資料庫 &gt; 「匯入 KeePass 1 資料庫……」。
+這是單向遷移。你無法用舊的 KeePassX 0.4 的版本開啟已匯入的資料庫。</translation>
+    </message>
+    <message>
+        <source>Unsupported KeePass 2 database version.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>KdbxXmlReader</name>
+    <message>
+        <source>XML parsing failure: %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No root group</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing icon uuid or data</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing custom data key or value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Multiple group elements</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null group uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid group icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableAutoType value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid EnableSearching value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No group uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null DeleteObject uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Missing DeletedObject uuid or time</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Null entry uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid entry icon number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element in history entry</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No entry uuid found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>History element with different uuid</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decrypt entry string</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate custom attribute found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry string key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Duplicate attachment found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Entry binary key or value missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Auto-type association window or sequence missing</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid bool value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid date time value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid color rgb part</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid uuid value</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to decompress binary</source>
+        <extracomment>Translator meant is a binary data inside an entry</extracomment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>KeePass1OpenWidget</name>
     <message>
         <source>Import KeePass1 database</source>
@@ -1276,6 +2267,35 @@ Do you want to open it anyway?</source>
         <translation>不支援的 KeePass 資料庫版本。</translation>
     </message>
     <message>
+        <source>Unable to read encryption IV</source>
+        <comment>IV = Initialization Vector for symmetric cipher</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of groups</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of entries</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid content hash size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid transform seed size</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Invalid number of transform rounds</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unable to construct group tree</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Root</source>
         <translation>根</translation>
     </message>
@@ -1287,129 +2307,141 @@ Do you want to open it anyway?</source>
         <source>Wrong key or database file is corrupt.</source>
         <translation>金鑰不正確或是資料庫損壞。</translation>
     </message>
-</context>
-<context>
-    <name>KeePass2Reader</name>
     <message>
-        <source>Not a KeePass database.</source>
-        <translation>並非 KeePass 資料庫。</translation>
+        <source>Key transformation failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unsupported KeePass database version.</source>
-        <translation>不支援的 KeePass 資料庫版本。</translation>
+        <source>Invalid group field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wrong key or database file is corrupt.</source>
-        <translation>金鑰不正確或是資料庫損壞。</translation>
+        <source>Invalid group field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <source>Read group field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group id field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>The selected file is an old KeePass 1 database (.kdb).
-
-You can import it by clicking on Database &gt; 'Import KeePass 1 database...'.
-This is a one-way migration. You won&apos;t be able to open the imported database with the old KeePassX 0.4 version.</source>
-        <translation>選擇的檔案是舊的 KeePass 1 資料庫 (.kdb)。
-
-你可以點選 資料庫 &gt; 「匯入 KeePass 1 資料庫……」。
-這是單向遷移。你無法用舊的 KeePassX 0.4 的版本開啟已匯入的資料庫。</translation>
+        <source>Incorrect group creation time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>KeePass2Writer</name>
     <message>
-        <source>Unable to issue challenge-response.</source>
+        <source>Incorrect group modification time field size</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Unable to calculate master key</source>
-        <translation>無法計算主金鑰</translation>
+        <source>Incorrect group access time field size</source>
+        <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>Main</name>
     <message>
-        <source>Fatal error while testing the cryptographic functions.</source>
-        <translation>測試加密函數時發生重大錯誤。</translation>
+        <source>Incorrect group expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC - Error</source>
-        <translation>KeePassXC - 錯誤</translation>
+        <source>Incorrect group icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>The lock file could not be created. Single-instance mode disabled.</source>
-        <translation>無法建立鎖定文件。已停用單一實例模式。</translation>
+        <source>Incorrect group level field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Another instance of KeePassXC is already running.</source>
-        <translation>其他 KeePassXC 程式正在運行中。</translation>
+        <source>Invalid group field type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <source>Missing group id or level</source>
         <translation type="unfinished"/>
     </message>
-</context>
-<context>
-    <name>MainWindow</name>
     <message>
-        <source>Open database</source>
-        <translation>開啟資料庫</translation>
+        <source>Missing entry field type number</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Database settings</source>
-        <translation>資料庫設定</translation>
+        <source>Invalid entry field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy username to clipboard</source>
-        <translation>將使用者名稱複製到剪貼簿</translation>
+        <source>Read entry field data doesn&apos;t match size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy password to clipboard</source>
-        <translation>將密碼複製到剪貼簿</translation>
+        <source>Invalid entry uuid field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>設定</translation>
+        <source>Invalid entry group id field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Show toolbar</source>
-        <translation>顯示工具列</translation>
+        <source>Invalid entry icon field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>read-only</source>
-        <translation>唯讀</translation>
+        <source>Invalid entry creation time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Toggle window</source>
-        <translation>切換視窗</translation>
+        <source>Invalid entry modification time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePass 2 Database</source>
-        <translation>KeePass 2 資料庫</translation>
+        <source>Invalid entry expiry time field size</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>All files</source>
-        <translation>所有檔案</translation>
+        <source>Invalid entry field type</source>
+        <translation type="unfinished"/>
     </message>
+</context>
+<context>
+    <name>Main</name>
     <message>
-        <source>Save repaired database</source>
-        <translation>儲存已修復的資料庫</translation>
+        <source>Existing single-instance lock file is invalid. Launching new instance.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Writing the database failed.</source>
-        <translation>寫入資料庫失敗。</translation>
+        <source>The lock file could not be created. Single-instance mode disabled.</source>
+        <translation>無法建立鎖定文件。已停用單一實例模式。</translation>
+    </message>
+    <message>
+        <source>Another instance of KeePassXC is already running.</source>
+        <translation>其他 KeePassXC 程式正在運行中。</translation>
+    </message>
+    <message>
+        <source>Fatal error while testing the cryptographic functions.</source>
+        <translation>測試加密函數時發生重大錯誤。</translation>
+    </message>
+    <message>
+        <source>KeePassXC - Error</source>
+        <translation>KeePassXC - 錯誤</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <source>&amp;Database</source>
+        <translation>資料庫 (&amp;D)</translation>
     </message>
     <message>
         <source>&amp;Recent databases</source>
         <translation>最近的資料庫 (&amp;R)</translation>
     </message>
     <message>
+        <source>Import</source>
+        <translation>匯入</translation>
+    </message>
+    <message>
+        <source>&amp;Help</source>
+        <translation>幫助 (&amp;H)</translation>
+    </message>
+    <message>
         <source>E&amp;ntries</source>
         <translation>項目 (&amp;N)</translation>
     </message>
@@ -1418,12 +2450,16 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>複製屬性到剪貼簿 (&amp;R)</translation>
     </message>
     <message>
+        <source>Time-based one-time password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Groups</source>
         <translation>群組 (&amp;G)</translation>
     </message>
     <message>
-        <source>&amp;View</source>
-        <translation>檢視 (&amp;V)</translation>
+        <source>&amp;Tools</source>
+        <translation>工具 (&amp;T)</translation>
     </message>
     <message>
         <source>&amp;Quit</source>
@@ -1434,6 +2470,10 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>關於 (&amp;A)</translation>
     </message>
     <message>
+        <source>&amp;Open database...</source>
+        <translation>開啟資料庫…… (&amp;O)</translation>
+    </message>
+    <message>
         <source>&amp;Save database</source>
         <translation>儲存資料庫 (&amp;S)</translation>
     </message>
@@ -1474,24 +2514,24 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>刪除群組 (&amp;D)</translation>
     </message>
     <message>
-        <source>&amp;Database settings</source>
-        <translation>資料庫設定 (&amp;D)</translation>
+        <source>Sa&amp;ve database as...</source>
+        <translation>將資料庫儲存為…… (&amp;V)</translation>
     </message>
     <message>
-        <source>&amp;Clone entry</source>
-        <translation>複製項目 (&amp;C)</translation>
+        <source>Change &amp;master key...</source>
+        <translation>變更主金鑰…… (&amp;M)</translation>
     </message>
     <message>
-        <source>Timed one-time password</source>
-        <translation>定時型一次性密碼 (TOTP)</translation>
+        <source>&amp;Database settings</source>
+        <translation>資料庫設定 (&amp;D)</translation>
     </message>
     <message>
-        <source>Copy &amp;TOTP</source>
-        <translation>複製 TOTP (&amp;T)</translation>
+        <source>Database settings</source>
+        <translation>資料庫設定</translation>
     </message>
     <message>
-        <source>Show TOTP</source>
-        <translation>顯示 TOTP</translation>
+        <source>&amp;Clone entry</source>
+        <translation>複製項目 (&amp;C)</translation>
     </message>
     <message>
         <source>&amp;Find</source>
@@ -1502,14 +2542,26 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>複製使用者名稱 (&amp;U)</translation>
     </message>
     <message>
+        <source>Copy username to clipboard</source>
+        <translation>將使用者名稱複製到剪貼簿</translation>
+    </message>
+    <message>
         <source>Cop&amp;y password</source>
         <translation>複製密碼 (&amp;Y)</translation>
     </message>
     <message>
+        <source>Copy password to clipboard</source>
+        <translation>將密碼複製到剪貼簿</translation>
+    </message>
+    <message>
         <source>&amp;Settings</source>
         <translation>設定 (&amp;S)</translation>
     </message>
     <message>
+        <source>Password Generator</source>
+        <translation>密碼產生器</translation>
+    </message>
+    <message>
         <source>&amp;Perform Auto-Type</source>
         <translation>執行自動輸入 (&amp;P)</translation>
     </message>
@@ -1526,165 +2578,210 @@ This is a one-way migration. You won&apos;t be able to open the imported databas
         <translation>標題 (&amp;T)</translation>
     </message>
     <message>
+        <source>Copy title to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;URL</source>
         <translation>網址 (&amp;U)</translation>
     </message>
     <message>
+        <source>Copy URL to clipboard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>&amp;Notes</source>
         <translation>附註 (&amp;N)</translation>
     </message>
     <message>
-        <source>Password Generator</source>
-        <translation>密碼產生器</translation>
+        <source>Copy notes to clipboard</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Clear history</source>
-        <translation>清除歷史記錄</translation>
+        <source>&amp;Export to CSV file...</source>
+        <translation>匯出到 CSV 檔案…… (&amp;E)</translation>
     </message>
     <message>
-        <source>&amp;Database</source>
-        <translation>資料庫 (&amp;D)</translation>
+        <source>Import KeePass 1 database...</source>
+        <translation>匯入 KeePass 1 資料庫……</translation>
     </message>
     <message>
-        <source>Import</source>
-        <translation>匯入</translation>
+        <source>Import CSV file...</source>
+        <translation>匯入 CSV 檔……</translation>
     </message>
     <message>
-        <source>&amp;Tools</source>
-        <translation>工具 (&amp;T)</translation>
+        <source>Re&amp;pair database...</source>
+        <translation>修復資料庫…… (&amp;P)</translation>
+    </message>
+    <message>
+        <source>Show TOTP</source>
+        <translation>顯示 TOTP</translation>
+    </message>
+    <message>
+        <source>Set up TOTP...</source>
+        <translation>安裝 TOTP</translation>
+    </message>
+    <message>
+        <source>Copy &amp;TOTP</source>
+        <translation>複製 TOTP (&amp;T)</translation>
     </message>
     <message>
-        <source>Empty recycle bin</source>
-        <translation>清空回收桶</translation>
+        <source>E&amp;mpty recycle bin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Clear history</source>
+        <translation>清除歷史記錄</translation>
     </message>
     <message>
         <source>Access error for config file %1</source>
         <translation>設定檔存取錯誤：%1</translation>
     </message>
     <message>
-        <source>Quit KeePassXC</source>
-        <translation>退出 KeePassXC</translation>
+        <source>&lt;p&gt;It looks like you are using KeePassHTTP for browser integration. This feature has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a class=&quot;link&quot;  href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt; (warning %1 of 3).&lt;/p&gt;</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Please touch the button on your YubiKey!</source>
-        <translation>請觸摸你 YubiKey 上的按鈕！</translation>
+        <source>read-only</source>
+        <translation>唯讀</translation>
     </message>
     <message>
-        <source>&amp;Help</source>
-        <translation>幫助 (&amp;H)</translation>
+        <source>Settings</source>
+        <translation>設定</translation>
     </message>
     <message>
-        <source>&amp;Open database...</source>
-        <translation>開啟資料庫…… (&amp;O)</translation>
+        <source>Toggle window</source>
+        <translation>切換視窗</translation>
     </message>
     <message>
-        <source>Sa&amp;ve database as...</source>
-        <translation>將資料庫儲存為…… (&amp;V)</translation>
+        <source>Quit KeePassXC</source>
+        <translation>退出 KeePassXC</translation>
     </message>
     <message>
-        <source>Change &amp;master key...</source>
-        <translation>變更主金鑰…… (&amp;M)</translation>
+        <source>KeePass 2 Database</source>
+        <translation>KeePass 2 資料庫</translation>
     </message>
     <message>
-        <source>&amp;Export to CSV file...</source>
-        <translation>匯出到 CSV 檔案…… (&amp;E)</translation>
+        <source>All files</source>
+        <translation>所有檔案</translation>
     </message>
     <message>
-        <source>Import KeePass 1 database...</source>
-        <translation>匯入 KeePass 1 資料庫……</translation>
+        <source>Open database</source>
+        <translation>開啟資料庫</translation>
     </message>
     <message>
-        <source>Import CSV file...</source>
-        <translation>匯入 CSV 檔……</translation>
+        <source>Save repaired database</source>
+        <translation>儲存已修復的資料庫</translation>
     </message>
     <message>
-        <source>Re&amp;pair database...</source>
-        <translation>修復資料庫…… (&amp;P)</translation>
+        <source>Writing the database failed.</source>
+        <translation>寫入資料庫失敗。</translation>
     </message>
     <message>
-        <source>Set up TOTP...</source>
-        <translation>安裝 TOTP</translation>
+        <source>Please touch the button on your YubiKey!</source>
+        <translation>請觸摸你 YubiKey 上的按鈕！</translation>
     </message>
 </context>
 <context>
-    <name>OptionDialog</name>
+    <name>OpenSSHKey</name>
     <message>
-        <source>Dialog</source>
-        <translation>對話方塊</translation>
+        <source>Invalid key file, expecting an OpenSSH key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>General</source>
-        <translation>一般</translation>
+        <source>PEM boundary mismatch</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sh&amp;ow a notification when credentials are requested</source>
-        <translation>要求憑證時顯示通知 (&amp;O)</translation>
+        <source>This is not an OpenSSH key, only modern keys are supported</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort matching entries by &amp;username</source>
-        <translation>依使用者名稱排序符合項目 (&amp;U)</translation>
+        <source>Base64 decoding failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;move all stored permissions from entries in active database</source>
-        <translation>從目前的資料庫項目中移除所有權限。</translation>
+        <source>Key file way too small.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>進階</translation>
+        <source>Key file magic header id invalid</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;access to entries</source>
-        <translation>總是允許存取項目 (&amp;A)</translation>
+        <source>Found zero keys</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Always allow &amp;updating entries</source>
-        <translation>總是允許更新項目 (&amp;U)</translation>
+        <source>Failed to read public key.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Searc&amp;h in all opened databases for matching entries</source>
-        <translation>在所有開啟的資料庫內搜尋相符的項目 (&amp;H)</translation>
+        <source>Corrupted key file, reading private key failed</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>HTTP Port:</source>
-        <translation>HTTP 埠：</translation>
+        <source>No private key payload to decrypt</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Default port: 19455</source>
-        <translation>預設埠：19455</translation>
+        <source>Unknown cipher: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Re&amp;quest to unlock the database if it is locked</source>
-        <translation>若資料庫已鎖定，則請求解鎖 (&amp;Q)</translation>
+        <source>Trying to run KDF without cipher</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Sort &amp;matching entries by title</source>
-        <translation>依名稱排序符合項目 (&amp;M)</translation>
+        <source>Passphrase is required to decrypt this key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>KeePassXC will listen to this port on 127.0.0.1</source>
-        <translation>KeePassXC 會在 127.0.0.1 上監聽此埠</translation>
+        <source>Key derivation failed, key file corrupted?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports</source>
-        <translation>無法綁定到特殊權限埠</translation>
+        <source>Unknown KDF: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Cannot bind to privileged ports below 1024!
-Using default port 19455.</source>
-        <translation>無法綁定到 1024 以下的特殊權限埠！
-將使用預設埠 19455。</translation>
+        <source>Decryption failed, wrong passphrase?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>R&amp;emove all shared encryption keys from active database</source>
-        <translation>從目前的資料庫移除所有共用的加密金鑰 (&amp;E)</translation>
+        <source>Unexpected EOF while reading public key</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
-        <translation>回傳 「KPH: 」 起首的進階文字欄位 (&amp;R)</translation>
+        <source>Unknown key type: </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Automatically creating or updating string fields is not supported.</source>
-        <translation>不支援自動建立或更新文字欄位。</translation>
+        <source>Unexpected EOF while reading private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write public key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing public key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Can&apos;t write private key as it is empty</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unexpected EOF when writing private key</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>OptionDialog</name>
+    <message>
+        <source>Dialog</source>
+        <translation>對話方塊</translation>
     </message>
     <message>
         <source>This is required for accessing your databases from ChromeIPass or PassIFox</source>
@@ -1695,6 +2792,15 @@ Using default port 19455.</source>
         <translation>啟用 KeePassHTTP 伺服器</translation>
     </message>
     <message>
+        <source>General</source>
+        <translation>一般</translation>
+    </message>
+    <message>
+        <source>Sh&amp;ow a notification when credentials are requested</source>
+        <extracomment>Credentials mean login data requested via browser extension</extracomment>
+        <translation>要求憑證時顯示通知 (&amp;O)</translation>
+    </message>
+    <message>
         <source>Only returns the best matches for a specific URL instead of all entries for the whole domain.</source>
         <translation>只回傳最佳的網址相符項目而非所有網址相符的項目。(&amp;R)</translation>
     </message>
@@ -1703,6 +2809,10 @@ Using default port 19455.</source>
         <translation>只回傳最佳的相符項目 (&amp;R)</translation>
     </message>
     <message>
+        <source>Re&amp;quest to unlock the database if it is locked</source>
+        <translation>若資料庫已鎖定，則請求解鎖 (&amp;Q)</translation>
+    </message>
+    <message>
         <source>Only entries with the same scheme (http://, https://, ftp://, ...) are returned.</source>
         <translation>只顯示相同協定的項目。(http://, https://, ftp://, ...)</translation>
     </message>
@@ -1711,27 +2821,108 @@ Using default port 19455.</source>
         <translation>符合網址協定 (&amp;M)</translation>
     </message>
     <message>
+        <source>Sort matching entries by &amp;username</source>
+        <translation>依使用者名稱排序符合項目 (&amp;U)</translation>
+    </message>
+    <message>
+        <source>Sort &amp;matching entries by title</source>
+        <translation>依名稱排序符合項目 (&amp;M)</translation>
+    </message>
+    <message>
+        <source>R&amp;emove all shared encryption keys from active database</source>
+        <translation>從目前的資料庫移除所有共用的加密金鑰 (&amp;E)</translation>
+    </message>
+    <message>
+        <source>Re&amp;move all stored permissions from entries in active database</source>
+        <translation>從目前的資料庫項目中移除所有權限。</translation>
+    </message>
+    <message>
         <source>Password Generator</source>
         <translation>密碼產生器</translation>
     </message>
     <message>
+        <source>Advanced</source>
+        <translation>進階</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;access to entries</source>
+        <translation>總是允許存取項目 (&amp;A)</translation>
+    </message>
+    <message>
+        <source>Always allow &amp;updating entries</source>
+        <translation>總是允許更新項目 (&amp;U)</translation>
+    </message>
+    <message>
         <source>Only the selected database has to be connected with a client.</source>
         <translation>只有所選的資料庫能連接到客戶端。</translation>
     </message>
     <message>
-        <source>The following options can be dangerous!
-Change them only if you know what you are doing.</source>
-        <translation>下列選項具有相當風險！
-了解其作用前切勿變更。</translation>
+        <source>Searc&amp;h in all opened databases for matching entries</source>
+        <translation>在所有開啟的資料庫內搜尋相符的項目 (&amp;H)</translation>
+    </message>
+    <message>
+        <source>Automatically creating or updating string fields is not supported.</source>
+        <translation>不支援自動建立或更新文字欄位。</translation>
+    </message>
+    <message>
+        <source>&amp;Return advanced string fields which start with &quot;KPH: &quot;</source>
+        <translation>回傳 「KPH: 」 起首的進階文字欄位 (&amp;R)</translation>
+    </message>
+    <message>
+        <source>HTTP Port:</source>
+        <translation>HTTP 埠：</translation>
+    </message>
+    <message>
+        <source>Default port: 19455</source>
+        <translation>預設埠：19455</translation>
+    </message>
+    <message>
+        <source>KeePassXC will listen to this port on 127.0.0.1</source>
+        <translation>KeePassXC 會在 127.0.0.1 上監聽此埠</translation>
+    </message>
+    <message>
+        <source>&lt;b&gt;Warning:&lt;/b&gt; The following options can be dangerous!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>&lt;p&gt;KeePassHTTP has been deprecated and will be removed in the future.&lt;br&gt;Please switch to KeePassXC-Browser instead! For help with migration, visit our &lt;a href=&quot;https://keepassxc.org/docs/keepassxc-browser-migration&quot;&gt;migration guide&lt;/a&gt;.&lt;/p&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports</source>
+        <translation>無法綁定到特殊權限埠</translation>
+    </message>
+    <message>
+        <source>Cannot bind to privileged ports below 1024!
+Using default port 19455.</source>
+        <translation>無法綁定到 1024 以下的特殊權限埠！
+將使用預設埠 19455。</translation>
     </message>
 </context>
 <context>
     <name>PasswordGeneratorWidget</name>
     <message>
+        <source>%p%</source>
+        <translation>%p%</translation>
+    </message>
+    <message>
         <source>Password:</source>
         <translation>密碼：</translation>
     </message>
     <message>
+        <source>strength</source>
+        <comment>Password strength</comment>
+        <translation>強度</translation>
+    </message>
+    <message>
+        <source>entropy</source>
+        <translation>entropy</translation>
+    </message>
+    <message>
+        <source>Password</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
         <source>Character Types</source>
         <translation>字元類型</translation>
     </message>
@@ -1752,38 +2943,50 @@ Change them only if you know what you are doing.</source>
         <translation>特殊字元</translation>
     </message>
     <message>
+        <source>Extended ASCII</source>
+        <translation>擴展 ASCII 碼</translation>
+    </message>
+    <message>
         <source>Exclude look-alike characters</source>
         <translation>去除相似的字元</translation>
     </message>
     <message>
-        <source>Accept</source>
-        <translation>接受</translation>
+        <source>Pick characters from every group</source>
+        <translation>從每一組中選擇字元</translation>
     </message>
     <message>
-        <source>%p%</source>
-        <translation>%p%</translation>
+        <source>&amp;Length:</source>
+        <translation>長度 (&amp;L)：</translation>
     </message>
     <message>
-        <source>strength</source>
-        <translation>強度</translation>
+        <source>Passphrase</source>
+        <translation>密語</translation>
     </message>
     <message>
-        <source>entropy</source>
-        <translation>entropy</translation>
+        <source>Wordlist:</source>
+        <translation>詞彙表：</translation>
     </message>
     <message>
-        <source>&amp;Length:</source>
-        <translation>長度 (&amp;L)：</translation>
+        <source>Word Count:</source>
+        <translation>詞彙數：</translation>
     </message>
     <message>
-        <source>Pick characters from every group</source>
-        <translation>從每一組中選擇字元</translation>
+        <source>Word Separator:</source>
+        <translation>單詞分隔符號：</translation>
     </message>
     <message>
         <source>Generate</source>
         <translation>產生</translation>
     </message>
     <message>
+        <source>Copy</source>
+        <translation>複製</translation>
+    </message>
+    <message>
+        <source>Accept</source>
+        <translation>接受</translation>
+    </message>
+    <message>
         <source>Close</source>
         <translation>關閉</translation>
     </message>
@@ -1793,7 +2996,7 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Entropy: %1 bit</source>
-        <translation type="unfinished"/>
+        <translation>Entropy: %1 bit</translation>
     </message>
     <message>
         <source>Password Quality: %1</source>
@@ -1801,51 +3004,270 @@ Change them only if you know what you are doing.</source>
     </message>
     <message>
         <source>Poor</source>
+        <comment>Password quality</comment>
         <translation>極弱</translation>
     </message>
     <message>
         <source>Weak</source>
+        <comment>Password quality</comment>
         <translation>較弱</translation>
     </message>
     <message>
         <source>Good</source>
+        <comment>Password quality</comment>
         <translation>較好</translation>
     </message>
     <message>
         <source>Excellent</source>
+        <comment>Password quality</comment>
         <translation>極好</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>Password</source>
-        <translation>密碼</translation>
+        <source>Database not opened</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extended ASCII</source>
-        <translation>擴展 ASCII 碼</translation>
+        <source>Database hash not available</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Passphrase</source>
-        <translation>密語</translation>
+        <source>Client public key not received</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Wordlist:</source>
-        <translation>詞彙表：</translation>
+        <source>Cannot decrypt message</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Count:</source>
-        <translation>詞彙數：</translation>
+        <source>Timeout or cannot connect to KeePassXC</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Word Separator:</source>
-        <translation>單詞分隔符號：</translation>
+        <source>Action cancelled or denied</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Copy</source>
-        <translation>複製</translation>
+        <source>Cannot encrypt message or public key not found. Is Native Messaging enabled in KeePassXC?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>KeePassXC association failed, try again</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key change was not successful</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Encryption key is not recognized</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No saved databases found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Incorrect action</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Empty message received</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No URL provided</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>No logins found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Unknown error</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Add a new entry to a database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the database.</source>
+        <translation>資料庫的路徑。</translation>
+    </message>
+    <message>
+        <source>Key file of the database.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Username for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>URL</source>
+        <translation>網址</translation>
+    </message>
+    <message>
+        <source>Prompt for the entry&apos;s password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Generate a password for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Length for the generated password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>length</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to add.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Copy an entry&apos;s password to the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to clip.</source>
+        <comment>clip = copy to clipboard</comment>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Timeout in seconds before clearing the clipboard.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Edit an entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Title for the entry.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>title</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Path of the entry to edit.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Estimate the entropy of a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Password for which to estimate the entropy.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Perform advanced analysis on the password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Extract and print the content of a database.</source>
+        <translation>提取與列印資料庫內容。</translation>
+    </message>
+    <message>
+        <source>Path of the database to extract.</source>
+        <translation>要提取的資料庫路徑。</translation>
+    </message>
+    <message>
+        <source>Insert password to unlock %1: </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Failed to load key file %1 : %2</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>WARNING: You are using a legacy key file format which may become
+unsupported in the future.
+
+Please consider generating a new key file.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>
+
+Available commands:
+</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the command to execute.</source>
+        <translation>要執行的命令的名稱。</translation>
+    </message>
+    <message>
+        <source>List database entries.</source>
+        <translation>列出資料庫項目。</translation>
+    </message>
+    <message>
+        <source>Path of the group to list. Default is /</source>
+        <translation>要列出的群組路徑。預設是 /</translation>
+    </message>
+    <message>
+        <source>Find entries quickly.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Search term.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Merge two databases.</source>
+        <translation>合併兩個資料庫。</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge into.</source>
+        <translation>合併時的目標資料庫路徑。</translation>
+    </message>
+    <message>
+        <source>Path of the database to merge from.</source>
+        <translation>合併時的來源資料庫路徑。</translation>
+    </message>
+    <message>
+        <source>Use the same credentials for both database files.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Key file of the database to merge from.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Show an entry&apos;s information.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Names of the attributes to show. This option can be specified more than once, with each attribute shown one-per-line in the given order. If no attributes are specified, a summary of the default attributes is given.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>attribute</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Name of the entry to show.</source>
+        <translation>要顯示的項目名稱。</translation>
     </message>
-</context>
-<context>
-    <name>QObject</name>
     <message>
         <source>NULL device</source>
         <translation>NULL 裝置</translation>
@@ -1869,7 +3291,27 @@ Change them only if you know what you are doing.</source>
         <translation>缺少右引號</translation>
     </message>
     <message>
-        <source>INTERNAL - unget lower bound exceeded</source>
+        <source>AES: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Twofish: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>ChaCha20: 256-bit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Argon2 (KDBX 4 – recommended)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 4)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>AES-KDF (KDBX 3.1)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1889,14 +3331,22 @@ Change them only if you know what you are doing.</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <source>URL</source>
-        <translation>網址</translation>
-    </message>
-    <message>
         <source>Notes</source>
         <translation>附註</translation>
     </message>
     <message>
+        <source>Last Modified</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Created</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Legacy Browser Integration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Browser Integration</source>
         <translation>瀏覽器整合</translation>
     </message>
@@ -1912,6 +3362,10 @@ Change them only if you know what you are doing.</source>
         <source>Passive</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <source>SSH Agent</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QtIOCompressor</name>
@@ -1950,8 +3404,8 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>SearchWidget</name>
     <message>
-        <source>Case Sensitive</source>
-        <translation>區分大小寫</translation>
+        <source>Search...</source>
+        <translation>搜尋……</translation>
     </message>
     <message>
         <source>Search</source>
@@ -1962,8 +3416,8 @@ Change them only if you know what you are doing.</source>
         <translation>清除</translation>
     </message>
     <message>
-        <source>Search...</source>
-        <translation>搜尋……</translation>
+        <source>Case Sensitive</source>
+        <translation>區分大小寫</translation>
     </message>
     <message>
         <source>Limit search to selected group</source>
@@ -1973,50 +3427,6 @@ Change them only if you know what you are doing.</source>
 <context>
     <name>Service</name>
     <message>
-        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
-Do you want to overwrite it?</source>
-        <translation>已存在名為「%1」的共用加密金鑰。
-進行覆蓋？</translation>
-    </message>
-    <message>
-        <source>Do you want to update the information in %1 - %2?</source>
-        <translation>更新 %1 到 %2 的資訊？</translation>
-    </message>
-    <message>
-        <source>The active database is locked!
-Please unlock the selected database or choose another one which is unlocked.</source>
-        <translation>目前的資料庫已鎖定！
-請解鎖所選的資料庫或選擇其他已解鎖的資料庫。</translation>
-    </message>
-    <message>
-        <source>Successfully removed %1 encryption-%2 from KeePassX/Http Settings.</source>
-        <translation>成功從 KeePassX/Http Settings 移除 %1 encryption-%2。</translation>
-    </message>
-    <message>
-        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
-        <translation>KeePassHttp Settings 中找不到共享加密金鑰。</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
-        <translation>目前的資料庫沒有 KeePassHttp Settings 項目。</translation>
-    </message>
-    <message>
-        <source>Removing stored permissions...</source>
-        <translation>正在移除所有已儲存的權限……</translation>
-    </message>
-    <message>
-        <source>Abort</source>
-        <translation>中止</translation>
-    </message>
-    <message>
-        <source>Successfully removed permissions from %1 %2.</source>
-        <translation>成功從 %1 %2 移除權限。</translation>
-    </message>
-    <message>
-        <source>The active database does not contain an entry with permissions.</source>
-        <translation>目前的資料庫中沒有帶有權限的項目。</translation>
-    </message>
-    <message>
         <source>KeePassXC: New key association request</source>
         <translation>KeePassXC：新的金鑰關聯請求</translation>
     </message>
@@ -2033,33 +3443,77 @@ give it a unique name to identify and accept it.</source>
         <translation>KeePassXC：覆蓋現有的金鑰？</translation>
     </message>
     <message>
+        <source>A shared encryption-key with the name &quot;%1&quot; already exists.
+Do you want to overwrite it?</source>
+        <translation>已存在名為「%1」的共用加密金鑰。
+進行覆蓋？</translation>
+    </message>
+    <message>
         <source>KeePassXC: Update Entry</source>
         <translation>KeePassXC：更新項目</translation>
     </message>
     <message>
+        <source>Do you want to update the information in %1 - %2?</source>
+        <translation>更新 %1 到 %2 的資訊？</translation>
+    </message>
+    <message>
         <source>KeePassXC: Database locked!</source>
         <translation>KeePassXC：資料庫已鎖定！</translation>
     </message>
     <message>
+        <source>The active database is locked!
+Please unlock the selected database or choose another one which is unlocked.</source>
+        <translation>目前的資料庫已鎖定！
+請解鎖所選的資料庫或選擇其他已解鎖的資料庫。</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed keys from database</source>
         <translation>KeePassXC：從資料庫中移除金鑰</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed %n encryption-key(s) from KeePassX/Http Settings.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No keys found</source>
         <translation>KeePassXC：找不到金鑰</translation>
     </message>
     <message>
+        <source>No shared encryption-keys found in KeePassHttp Settings.</source>
+        <translation>KeePassHttp Settings 中找不到共享加密金鑰。</translation>
+    </message>
+    <message>
         <source>KeePassXC: Settings not available!</source>
         <translation>KeePassXC：設定不可用！</translation>
     </message>
     <message>
+        <source>The active database does not contain an entry of KeePassHttp Settings.</source>
+        <translation>目前的資料庫沒有 KeePassHttp Settings 項目。</translation>
+    </message>
+    <message>
+        <source>Removing stored permissions...</source>
+        <translation>正在移除所有已儲存的權限……</translation>
+    </message>
+    <message>
+        <source>Abort</source>
+        <translation>中止</translation>
+    </message>
+    <message>
         <source>KeePassXC: Removed permissions</source>
         <translation>KeePassXC：已移除權限</translation>
     </message>
+    <message numerus="yes">
+        <source>Successfully removed permissions from %n entries.</source>
+        <translation type="unfinished"><numerusform></numerusform></translation>
+    </message>
     <message>
         <source>KeePassXC: No entry with permissions found!</source>
         <translation>KeePassXC：找不到帶有權限的項目！</translation>
     </message>
+    <message>
+        <source>The active database does not contain an entry with permissions.</source>
+        <translation>目前的資料庫中沒有帶有權限的項目。</translation>
+    </message>
 </context>
 <context>
     <name>SettingsWidget</name>
@@ -2083,10 +3537,26 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>SettingsWidgetGeneral</name>
     <message>
+        <source>Basic Settings</source>
+        <translation>基本設定</translation>
+    </message>
+    <message>
+        <source>Start only a single instance of KeePassXC</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Remember last databases</source>
         <translation>記住最近的資料庫</translation>
     </message>
     <message>
+        <source>Remember last key files and security dongles</source>
+        <translation>記住最近的金鑰檔案與安全鎖</translation>
+    </message>
+    <message>
+        <source>Load previous databases on startup</source>
+        <translation>啟動時載入之前的資料庫</translation>
+    </message>
+    <message>
         <source>Automatically save on exit</source>
         <translation>離開時，自動儲存</translation>
     </message>
@@ -2095,20 +3565,28 @@ give it a unique name to identify and accept it.</source>
         <translation>修改後，自動儲存</translation>
     </message>
     <message>
+        <source>Automatically reload the database when modified externally</source>
+        <translation>當有外部修改時自動重新載入資料庫</translation>
+    </message>
+    <message>
         <source>Minimize when copying to clipboard</source>
         <translation>在複製到剪貼簿時最小化</translation>
     </message>
     <message>
+        <source>Minimize window at application startup</source>
+        <translation>程式啟動時視窗最小化</translation>
+    </message>
+    <message>
         <source>Use group icon on entry creation</source>
         <translation>新增項目時使用群組圖示</translation>
     </message>
     <message>
-        <source>Global Auto-Type shortcut</source>
-        <translation>全域自動輸入快捷鍵</translation>
+        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
+        <translation>未變更資料時（例如：擴展群組時）不要將資料庫標記為已修改</translation>
     </message>
     <message>
-        <source>Language</source>
-        <translation>語言</translation>
+        <source>Hide the Details view</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show a system tray icon</source>
@@ -2119,66 +3597,60 @@ give it a unique name to identify and accept it.</source>
         <translation>將視窗最小化至工作列</translation>
     </message>
     <message>
-        <source>Load previous databases on startup</source>
-        <translation>啟動時載入之前的資料庫</translation>
-    </message>
-    <message>
-        <source>Automatically reload the database when modified externally</source>
-        <translation>當有外部修改時自動重新載入資料庫</translation>
-    </message>
-    <message>
         <source>Hide window to system tray instead of app exit</source>
         <translation>將視窗最小化至工作列而非關閉程式</translation>
     </message>
     <message>
-        <source>Minimize window at application startup</source>
-        <translation>程式啟動時視窗最小化</translation>
-    </message>
-    <message>
-        <source>Basic Settings</source>
-        <translation>基本設定</translation>
-    </message>
-    <message>
-        <source>Remember last key files and security dongles</source>
-        <translation>記住最近的金鑰檔案與安全鎖</translation>
+        <source>Dark system tray icon</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Don&apos;t mark database as modified for non-data changes (e.g., expanding groups)</source>
-        <translation>未變更資料時（例如：擴展群組時）不要將資料庫標記為已修改</translation>
+        <source>Language</source>
+        <translation>語言</translation>
     </message>
     <message>
         <source>Auto-Type</source>
         <translation>自動輸入</translation>
     </message>
     <message>
-        <source>Use entry title and URL to match windows for global Auto-Type</source>
-        <translation>使用項目標題與網址來找尋自動輸入的目標視窗</translation>
+        <source>Use entry title to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Use entry URL to match windows for global Auto-Type</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Always ask before performing Auto-Type</source>
         <translation>在執行自動輸入前始終詢問</translation>
     </message>
     <message>
+        <source>Global Auto-Type shortcut</source>
+        <translation>全域自動輸入快捷鍵</translation>
+    </message>
+    <message>
         <source>Auto-Type delay</source>
         <translation>自動輸入延遲</translation>
     </message>
     <message>
         <source> ms</source>
+        <comment>Milliseconds</comment>
         <translation>毫秒</translation>
     </message>
-    <message>
-        <source>Start only a single instance of KeePassXC</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>SettingsWidgetSecurity</name>
     <message>
+        <source>Timeouts</source>
+        <translation>超時</translation>
+    </message>
+    <message>
         <source>Clear clipboard after</source>
         <translation>多久後清除剪貼簿</translation>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> 秒</translation>
     </message>
     <message>
@@ -2186,8 +3658,12 @@ give it a unique name to identify and accept it.</source>
         <translation>多久沒有動作之後鎖定資料庫</translation>
     </message>
     <message>
-        <source>Show passwords in cleartext by default</source>
-        <translation>預設以明碼顯示密碼</translation>
+        <source>Convenience</source>
+        <translation>便利</translation>
+    </message>
+    <message>
+        <source>Lock databases when session is locked or lid is closed</source>
+        <translation>當工作階段鎖定或蓋上螢幕時鎖定資料庫</translation>
     </message>
     <message>
         <source>Lock databases after minimizing the window</source>
@@ -2198,16 +3674,16 @@ give it a unique name to identify and accept it.</source>
         <translation>顯示密碼時不需要重複輸入密碼</translation>
     </message>
     <message>
-        <source>Timeouts</source>
-        <translation>超時</translation>
+        <source>Show passwords in cleartext by default</source>
+        <translation>預設以明碼顯示密碼</translation>
     </message>
     <message>
-        <source>Convenience</source>
-        <translation>便利</translation>
+        <source>Hide passwords in the preview panel</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>Lock databases when session is locked or lid is closed</source>
-        <translation>當工作階段鎖定或蓋上螢幕時鎖定資料庫</translation>
+        <source>Hide entry notes by default</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Privacy</source>
@@ -2229,6 +3705,14 @@ give it a unique name to identify and accept it.</source>
         <translation>金鑰：</translation>
     </message>
     <message>
+        <source>Default RFC 6238 token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <source>Steam token settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <source>Use custom settings</source>
         <translation>使用自訂設定</translation>
     </message>
@@ -2254,6 +3738,7 @@ give it a unique name to identify and accept it.</source>
     </message>
     <message>
         <source> sec</source>
+        <comment>Seconds</comment>
         <translation> 秒</translation>
     </message>
 </context>
@@ -2321,88 +3806,40 @@ give it a unique name to identify and accept it.</source>
 <context>
     <name>main</name>
     <message>
-        <source>path to a custom config file</source>
-        <translation>自訂設定檔路徑</translation>
-    </message>
-    <message>
-        <source>key file of the database</source>
-        <translation>資料庫的金鑰檔案</translation>
-    </message>
-    <message>
-        <source>KeePassXC - cross-platform password manager</source>
-        <translation>KeePassXC - 跨平台的密碼管理工具</translation>
-    </message>
-    <message>
-        <source>read password of the database from stdin</source>
-        <translation>從 stdin 讀取資料庫密碼</translation>
-    </message>
-    <message>
-        <source>filenames of the password databases to open (*.kdbx)</source>
-        <translation>欲開啟的密碼資料庫檔名 (*.kdbx)</translation>
-    </message>
-    <message>
-        <source>Copy a password to the clipboard</source>
-        <translation>將密碼複製到剪貼簿</translation>
+        <source>Remove an entry from the database.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Path of the database.</source>
         <translation>資料庫的路徑。</translation>
     </message>
     <message>
-        <source>Use a GUI prompt unlocking the database.</source>
-        <translation>使用 GUI 提示來解鎖資料庫。</translation>
-    </message>
-    <message>
-        <source>Name of the entry to clip.</source>
+        <source>Path of the entry to remove.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <source>Extract and print the content of a database.</source>
-        <translation>提取與列印資料庫內容。</translation>
-    </message>
-    <message>
-        <source>Path of the database to extract.</source>
-        <translation>要提取的資料庫路徑。</translation>
-    </message>
-    <message>
-        <source>Name of the command to execute.</source>
-        <translation>要執行的命令的名稱。</translation>
-    </message>
-    <message>
-        <source>List database entries.</source>
-        <translation>列出資料庫項目。</translation>
-    </message>
-    <message>
-        <source>Path of the group to list. Default is /</source>
-        <translation>要列出的群組路徑。預設是 /</translation>
-    </message>
-    <message>
-        <source>Print the UUIDs of the entries and groups.</source>
-        <translation>列印項目與群組的 UUID</translation>
-    </message>
-    <message>
-        <source>Merge two databases.</source>
-        <translation>合併兩個資料庫。</translation>
+        <source>KeePassXC - cross-platform password manager</source>
+        <translation>KeePassXC - 跨平台的密碼管理工具</translation>
     </message>
     <message>
-        <source>Path of the database to merge into.</source>
-        <translation>合併時的目標資料庫路徑。</translation>
+        <source>filenames of the password databases to open (*.kdbx)</source>
+        <translation>欲開啟的密碼資料庫檔名 (*.kdbx)</translation>
     </message>
     <message>
-        <source>Path of the database to merge from.</source>
-        <translation>合併時的來源資料庫路徑。</translation>
+        <source>path to a custom config file</source>
+        <translation>自訂設定檔路徑</translation>
     </message>
     <message>
-        <source>Use the same password for both database files.</source>
-        <translation>在這兩個資料庫檔案使用相同的密碼。</translation>
+        <source>key file of the database</source>
+        <translation>資料庫的金鑰檔案</translation>
     </message>
     <message>
-        <source>Show a password.</source>
-        <translation>顯示密碼。</translation>
+        <source>read password of the database from stdin</source>
+        <translation>從 stdin 讀取資料庫密碼</translation>
     </message>
     <message>
-        <source>Name of the entry to show.</source>
-        <translation>要顯示的項目名稱。</translation>
+        <source>Parent window handle</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file