diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index dabf34100..81a757d6c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -18,8 +18,7 @@
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 
     Czech translation by Jan Vaněk
--->
-<resources>
+--><resources>
     <string name="about_feedback">Nahlášení problému</string>
     <string name="about_homepage">Domovská stránka</string>
     <string name="about_description">Androidová verze správce hesel KeePass</string>
@@ -240,7 +239,7 @@
     <string name="lock_database_screen_off_summary">Při zhasnutí obrazovky uzamknout databázi</string>
     <string name="advanced_unlock">Pokročilé odemčení</string>
     <string name="biometric_unlock_enable_title">Biometrické odemčení</string>
-    <string name="biometric_unlock_enable_summary">Nechá otevřít databázi snímáním otisku prstu</string>
+    <string name="biometric_unlock_enable_summary">Nechá otevřít databázi snímáním biometrického údaje</string>
     <string name="biometric_delete_all_key_title">Smazat šifrovací klíče</string>
     <string name="biometric_delete_all_key_summary">Smazat všechny šifrovací klíče související s biometrickým rozlišením</string>
     <string name="biometric_delete_all_key_warning">Opravdu chcete smazat všechny klíče související s biometrickým rozlišením\?</string>
@@ -315,15 +314,12 @@
     <string name="education_donation_title">Zapojit se</string>
     <string name="education_donation_summary">Zapojte se a pomozte zvýšit stabilitu, bezpečnost a přidávání dalších funkcí.</string>
     <string name="html_text_ad_free">Narozdíl od mnoha aplikací pro správu hesel, tato je <strong>bez reklam</strong>, je <strong>svobodným softwarem</strong> a neodesílá nikam žádné osobní údaje, bez ohledu na to, jakou verzi používáte.</string>
-    <string name="html_text_buy_pro">Zakoupením varianty „pro“ získáte přístup k této <strong>vizuální funkci</strong> a hlavně pomůžete <strong>uskutečnění komunitních projektů.</strong>
-    </string>
+    <string name="html_text_buy_pro">Zakoupením varianty „pro“ získáte přístup k této <strong>vizuální funkci</strong> a hlavně pomůžete <strong>uskutečnění komunitních projektů.</strong></string>
     <string name="html_text_feature_generosity">Tato <strong>vizuální funkce</strong> je k dispozici díky vaší štědrosti.</string>
-    <string name="html_text_donation">Pro zajištění svobody nás všech a pokračování aktivity, počítáme s vaším <strong>přispěním.</strong>
-    </string>
+    <string name="html_text_donation">Pro zajištění svobody nás všech a pokračování aktivity, počítáme s vaším <strong>přispěním.</strong></string>
     <string name="html_text_dev_feature">Tato funkce je <strong>ve vývoji</strong> a potřebuje váš <strong>příspěvek</strong>, aby byla brzy k dispozici.</string>
     <string name="html_text_dev_feature_buy_pro">Zakoupením <strong>pro</strong> varianty,</string>
-    <string name="html_text_dev_feature_contibute">
-        <strong>Zapojením se</strong>,</string>
+    <string name="html_text_dev_feature_contibute"><strong>Zapojením se</strong>,</string>
     <string name="html_text_dev_feature_encourage">povzbudíte vývojáře k přidávání <strong>nových funkcí</strong> a <strong>opravování chyb</strong> dle vašich připomínek.</string>
     <string name="html_text_dev_feature_thanks">Mnohé díky za vaše přispění.</string>
     <string name="html_text_dev_feature_work_hard">Tvrdě pracujeme na brzkém vydání této funkce.</string>
@@ -358,7 +354,7 @@
     <string name="keyboard_key_sound_title">Vydat zvuk při stisku klávesy</string>
     <string name="selection_mode">Režim výběru</string>
     <string name="do_not_kill_app">Neshoďte aplikaci…</string>
-    <string name="lock_database_back_root_title">K uzamknutí stiskněte Zpět v hlavním panelu</string>
+    <string name="lock_database_back_root_title">K uzamknutí stiskněte Zpět</string>
     <string name="lock_database_back_root_summary">Zamknout obrazovku, pokud uživatel stiskne tlačítko Zpět v hlavním panelu</string>
     <string name="clear_clipboard_notification_title">Vymazat při ukončení</string>
     <string name="clear_clipboard_notification_summary">Uzavřít databázi při uzavření oznámení</string>
@@ -401,4 +397,51 @@
     <string name="biometric_auto_open_prompt_summary">Automaticky otevřít biometrickou pobídku, je-li biometrický klíč pro databázi definován</string>
     <string name="enable">Zapnout</string>
     <string name="disable">Vypnout</string>
+    <string name="master_key">Hlavní klíč</string>
+    <string name="security">Zabezpečení</string>
+    <string name="entry_history">Historie</string>
+    <string name="entry_setup_otp">Nastavit heslo na jedno použití (OTP)</string>
+    <string name="otp_type">Typ OTP</string>
+    <string name="otp_secret">Tajnost</string>
+    <string name="otp_period">Interval (vteřiny)</string>
+    <string name="otp_counter">Čítač</string>
+    <string name="otp_digits">Číslice</string>
+    <string name="otp_algorithm">Algoritmus</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Neplatná OTP tajnost.</string>
+    <string name="error_disallow_no_credentials">Nejméně jeden přihlašovací údaj musí být zadán.</string>
+    <string name="error_copy_group_here">Sem skupinu kopírovat nemůžete.</string>
+    <string name="error_otp_secret_key">Tajný klíč musí mít formát Base32.</string>
+    <string name="error_otp_counter">Čítač musít být mezi %1$d a %2$d.</string>
+    <string name="error_otp_period">Interval musít být mezi %1$d a %2$d vteřinami.</string>
+    <string name="error_otp_digits">Token musí obsahovat mezi %1$d a %2$d číslicemi.</string>
+    <string name="invalid_db_same_uuid">%1$s s totožným UUID %2$s již existuje.</string>
+    <string name="creating_database">Zakládám databázi…</string>
+    <string name="menu_security_settings">Nastavení zabezpečení</string>
+    <string name="menu_master_key_settings">Nastavení hlavního klíče</string>
+    <string name="contains_duplicate_uuid">Databáze obsahuje duplikátní UUID.</string>
+    <string name="contains_duplicate_uuid_procedure">Prověřením toho dialogu opraví KeePassDX chybu (založením nového UUID pro duplikáty) a bude pokračovat.</string>
+    <string name="database_opened">Databáze otevřena</string>
+    <string name="clipboard_explanation_summary">Kopírujte pole záznamů pomocí schránky Vašeho zařízení</string>
+    <string name="persistent_notification_title">Trvalé oznámení</string>
+    <string name="persistent_notification_summary">Přidat oznámení, když je databáze otevřena</string>
+    <string name="advanced_unlock_explanation_summary">K snadnějšímu otevření databáze použijte pokročilé odemknutí</string>
+    <string name="database_data_compression_title">Komprese dat</string>
+    <string name="database_data_compression_summary">Komprese dat snižuje velikost databáze.</string>
+    <string name="max_history_items_title">Max. položek v historii</string>
+    <string name="max_history_items_summary">Omezit počet položek v historii záznamu</string>
+    <string name="max_history_size_title">Max. velikost historie</string>
+    <string name="max_history_size_summary">Omezit velikost historie na záznam (v binárních bajtech)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Doporučit změnu</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Dporučit změnu hlavního klíče (dny)</string>
+    <string name="settings_database_force_changing_master_key_title">Vynutit změnu</string>
+    <string name="settings_database_force_changing_master_key_summary">Vynutit změnu hlavního klíče (dny)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Vynutit změnu příště</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Vynutit změnu hlavního klíče příště (jednou)</string>
+    <string name="database_default_username_title">Výchozí uživatelské jméno</string>
+    <string name="database_custom_color_title">Vlastní barva databáze</string>
+    <string name="compression">Komprese</string>
+    <string name="compression_none">Žádná</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Nastavení klávesnice zařízení</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 0a920e5e2..363e0302e 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -18,8 +18,7 @@
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 
     Danish translation by Frederik Svarre (fsvarre@gmail.com)
--->
-<resources>
+--><resources>
     <string name="about_feedback">Tilbagemelding</string>
     <string name="about_homepage">Hjemmeside</string>
     <string name="about_description">Android implementering af KeePass password manager</string>
@@ -357,7 +356,7 @@
     <string name="entry_notes">Noter</string>
     <string name="selection_mode">Valgstilstand</string>
     <string name="do_not_kill_app">Luk ikke programmet…</string>
-    <string name="lock_database_back_root_title">Lås ved retur</string>
+    <string name="lock_database_back_root_title">Tryk på \'Tilbage\' for at låse</string>
     <string name="lock_database_back_root_summary">Lås databasen, når brugeren klikker på tilbage-knappen fra startskærmen</string>
     <string name="clear_clipboard_notification_title">Ryd ved lukning</string>
     <string name="clear_clipboard_notification_summary">Luk databasen ved lukning af underretning</string>
@@ -400,4 +399,51 @@
     <string name="biometric_auto_open_prompt_summary">Åbn automatisk biometrisk prompt, når der er defineret en biometrisk nøgle for en database</string>
     <string name="enable">Aktiver</string>
     <string name="disable">Deaktiver</string>
+    <string name="master_key">Hovednøgle</string>
+    <string name="security">Sikkerhed</string>
+    <string name="entry_history">Historik</string>
+    <string name="entry_setup_otp">Indstilling af engangsadgangskode</string>
+    <string name="otp_type">OTP-type</string>
+    <string name="otp_secret">Hemmelig</string>
+    <string name="otp_period">Periode (sekunder)</string>
+    <string name="otp_counter">Tæller</string>
+    <string name="otp_digits">Cifre</string>
+    <string name="otp_algorithm">Algoritme</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Ugyldig OTP-hemmelighed.</string>
+    <string name="error_disallow_no_credentials">Der skal angives mindst en legitimationsoplysning.</string>
+    <string name="error_copy_group_here">En gruppe kan ikke kopieres her.</string>
+    <string name="error_otp_secret_key">Den hemmelige nøgle skal være i Base32-format.</string>
+    <string name="error_otp_counter">Tæller skal være mellem %1$d og %2$d.</string>
+    <string name="error_otp_period">Perioden skal være mellem %1$d og %2$d sekunder.</string>
+    <string name="error_otp_digits">Token skal indeholder %1$d til %2$d cifre.</string>
+    <string name="invalid_db_same_uuid">%1$s med det samme UUID %2$s findes allerede.</string>
+    <string name="creating_database">Opretter database…</string>
+    <string name="menu_security_settings">Sikkerhedsindstillinger</string>
+    <string name="menu_master_key_settings">Indstillinger for hovednøgle</string>
+    <string name="contains_duplicate_uuid">Databasen indeholder dublerede UUID\'er.</string>
+    <string name="contains_duplicate_uuid_procedure">Ved at godkende dialogboksen, vil KeePass DX løse problemet (ved at generere nye UUID\'er for dubletter) og fortsætte.</string>
+    <string name="database_opened">Database åbnet</string>
+    <string name="clipboard_explanation_summary">Kopier indtastningsfelter ved hjælp af enhedens udklipsholder</string>
+    <string name="persistent_notification_title">Vedvarende meddelelse</string>
+    <string name="persistent_notification_summary">Tilføj en meddelelse, når databasen er åben</string>
+    <string name="advanced_unlock_explanation_summary">Brug avanceret oplåsning for at gøre det lettere at åbne en database</string>
+    <string name="database_data_compression_title">Datakomprimering</string>
+    <string name="database_data_compression_summary">Datakomprimering reducerer størrelsen på databasen.</string>
+    <string name="max_history_items_title">Maks. historikposter</string>
+    <string name="max_history_items_summary">Begræns antallet af historikposter pr. indtastning</string>
+    <string name="max_history_size_title">Maks. historiestørrelse</string>
+    <string name="max_history_size_summary">Begræns historikstørrelse pr. post (i binære bytes)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Anbefalet ændring</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Anbefal ændring af hovednøglen (dage)</string>
+    <string name="settings_database_force_changing_master_key_title">Gennemtving ændring</string>
+    <string name="settings_database_force_changing_master_key_summary">Gennemtving ændring af hovednøglen (dage)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Gennemtving ændring næste gang</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Gennemtving ændring af hovednøglen næste gang (én gang)</string>
+    <string name="database_default_username_title">Standard brugernavn</string>
+    <string name="database_custom_color_title">Brugerdefineret databasefarve</string>
+    <string name="compression">Komprimering</string>
+    <string name="compression_none">Ingen</string>
+    <string name="compression_gzip">Gzip</string>
+    <string name="device_keyboard_setting_title">Indstillinger for enhedens tastatur</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 964b2aa82..ce6b71c76 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -20,8 +20,7 @@
     Translations from BoDEAN
     Translations from Matthias Dill
     Translations from David Ramiro
--->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+--><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="about_feedback">Rückmeldung</string>
     <string name="about_homepage">Webseite</string>
     <string name="about_description">Android-Implementierung des Passwortmanagers KeePass</string>
@@ -29,24 +28,24 @@
     <string name="add_entry">Eintrag hinzufügen</string>
     <string name="add_group">Gruppe hinzufügen</string>
     <string name="encryption_algorithm">Verschlüsselungsalgorithmus</string>
-    <string name="app_timeout">App-Sperre</string>
-    <string name="app_timeout_summary">Dauer der Inaktivität bis die App gesperrt wird</string>
+    <string name="app_timeout">App-Timeout</string>
+    <string name="app_timeout_summary">Inaktivität vor dem Sperren der App</string>
     <string name="application">App</string>
-    <string name="menu_app_settings">App Einstellungen</string>
+    <string name="menu_app_settings">App-Einstellungen</string>
     <string name="beta_dontask">Nicht mehr anzeigen</string>
     <string name="brackets">Klammern</string>
-    <string name="file_manager_install_description">Durchsuchen Sie Ihre Dateien, indem Sie den OpenIntents File Manager installieren</string>
+    <string name="file_manager_install_description">Das Erstellen, Öffnen und Speichern einer Datenbankdatei erfordert die Installation eines Dateimanagers, der die beabsichtigten Aktionen ACTION_CREATE_DOCUMENT und ACTION_OPEN_DOCUMENT akzeptiert.</string>
     <string name="clipboard_cleared">Zwischenablage geleert</string>
-    <string name="clipboard_error_title">Zwischenablagefehler</string>
+    <string name="clipboard_error_title">Zwischenablage-Fehler</string>
     <string name="clipboard_error">Einige Samsung Android-Smartphones lassen keine Nutzung der Zwischenablage durch Apps zu.</string>
     <string name="clipboard_error_clear">Leeren der Zwischenablage fehlgeschlagen</string>
-    <string name="clipboard_timeout">Zwischenablagesperre</string>
+    <string name="clipboard_timeout">Zwischenablage-Timeout</string>
     <string name="clipboard_timeout_summary">Dauer der Speicherung in der Zwischenablage</string>
     <string name="select_to_copy">%1$s in die Zwischenablage kopieren</string>
     <string name="retrieving_db_key">Datenbank-Schlüsseldatei erzeugen …</string>
     <string name="database">Datenbank</string>
     <string name="decrypting_db">Entschlüsselung der Datenbankinhalte …</string>
-    <string name="default_checkbox">Als Standard-Datenbank benutzen</string>
+    <string name="default_checkbox">Als Standard-Datenbank verwenden</string>
     <string name="digits">Zahlen</string>
     <string name="disclaimer_formal">KeePass DX © %1$d Kunzisoft. Alle Rechte vorbehalten. Die Nutzung der Software erfolgt auf eigene Verantwortung und ohne jegliche Garantie. Die Applikation ist frei und wird unter den Bedingungen der GNU GPL Version 3 (oder später) verbreitet und lizenziert.</string>
     <string name="select_database_file">Vorhandene Datenbank öffnen</string>
@@ -58,7 +57,7 @@
     <string name="entry_expires">Ablaufdatum</string>
     <string name="entry_keyfile">Schlüsseldatei</string>
     <string name="entry_modified">Änderungsdatum</string>
-    <string name="entry_not_found">Eintrag wurde nicht gefunden.</string>
+    <string name="entry_not_found">Zugriffsdaten wurden nicht gefunden.</string>
     <string name="entry_password">Passwort</string>
     <string name="entry_save">Speichern</string>
     <string name="entry_title">Titel</string>
@@ -72,9 +71,9 @@
     <string name="error_no_name">Namen eingeben.</string>
     <string name="error_nokeyfile">Schlüsseldatei wählen.</string>
     <string name="error_out_of_memory">Zu wenig Speicherplatz, um die ganze Datenbank zu laden.</string>
-    <string name="error_pass_gen_type">Mindestens eine Art der Passwortgenerierung muss ausgewählt werden.</string>
+    <string name="error_pass_gen_type">Mindestens eine Art der Passwortgenerierung muss ausgewählt sein.</string>
     <string name="error_pass_match">Die Passwörter stimmen nicht überein.</string>
-    <string name="error_rounds_too_large">„Transformationsrunden“ zu hoch. Wird auf 214748364848 eingestellt.</string>
+    <string name="error_rounds_too_large">„Transformationsrunden“ zu hoch. Wird auf 2147483648 eingestellt.</string>
     <string name="error_string_key">Für jede Zeichenfolge ist ein Feldname notwendig.</string>
     <string name="error_title_required">Titel hinzufügen.</string>
     <string name="error_wrong_length">Eine positive ganze Zahl in das Feld „Länge“ eingeben.</string>
@@ -98,8 +97,8 @@
     <string name="keyfile_does_not_exist">Es existiert keine Schlüsseldatei.</string>
     <string name="keyfile_is_empty">Die Schlüsseldatei ist leer.</string>
     <string name="length">Länge</string>
-    <string name="list_size_title">Gruppenliste</string>
-    <string name="list_size_summary">Schriftgröße der Gruppenliste</string>
+    <string name="list_size_title">Größe der Listenelemente</string>
+    <string name="list_size_summary">Schriftgröße der Listenelemente</string>
     <string name="loading_database">Datenbank wird geladen …</string>
     <string name="lowercase">Kleinbuchstaben</string>
     <string name="maskpass_title">Passwort verstecken</string>
@@ -110,8 +109,8 @@
     <string name="menu_database_settings">Datenbank-Einstellungen</string>
     <string name="menu_delete">Löschen</string>
     <string name="menu_donate">Spenden</string>
-    <string name="menu_edit">Ändern</string>
-    <string name="menu_hide_password">Passwort verstecken</string>
+    <string name="menu_edit">Bearbeiten</string>
+    <string name="menu_hide_password">Passwort ausblenden</string>
     <string name="menu_lock">Datenbank sperren</string>
     <string name="menu_open">Öffnen</string>
     <string name="menu_search">Suchen</string>
@@ -143,22 +142,22 @@
     <string name="saving_database">Datenbank wird gespeichert …</string>
     <string name="space">Leerzeichen</string>
     <string name="search_label">Suchen</string>
-    <string name="sort_db">Natürliche Datenbank</string>
+    <string name="sort_db">Natürliche Sortierung</string>
     <string name="special">Spezialsymbole</string>
-    <string name="search">Titel/Beschreibung des Eintrags</string>
+    <string name="search">Suchen</string>
     <string name="search_results">Suchergebnisse</string>
     <string name="encryption_twofish">Twofish</string>
     <string name="underline">Unterstriche</string>
     <string name="unsupported_db_version">Datenbankversion wird nicht unterstützt.</string>
     <string name="uppercase">Großbuchstaben</string>
     <string name="warning">Warnung</string>
-    <string name="warning_password_encoding">Passwortzeichen in .kbd-Dateien vermeiden, die nicht Teil des Latin-1-Zeichensatzes sind, da sie alle in ein und dasselbe Zeichen umgewandelt werden.</string>
+    <string name="warning_password_encoding">Passwortzeichen in der Datenbank vermeiden, die kein Text-Encoding-Format besitzen (nicht erkannte Zeichen werden in denselben Buchstaben umgewandelt).</string>
     <string name="warning_read_only">Schreibzugriff auf die SD-Karte gewähren, um Datenbankänderungen speichern zu können.</string>
     <string name="warning_unmounted">Die SD-Karte einbinden, um eine Datenbank erstellen oder laden zu können.</string>
     <string name="version_label">Version %1$s</string>
-    <string name="education_unlock_summary">Das Passwort und/oder eine Schlüsseldatei zum Entsperren der Datenbank eingeben. 
-\n 
-\nDaran denken, nach jeder Änderung die .kdbx-Datei an einem sicheren Ort abzuspeichern.</string>
+    <string name="education_unlock_summary">Geben Sie das Passwort und/oder die Schlüsseldatei ein, um Ihre Datenbank zu entsperren.
+\n
+\nSichern Sie Ihre Datenbankdatei nach jeder Änderung an einem sicheren Ort.</string>
     <string-array name="timeout_options">
         <item>5 Sekunden</item>
         <item>10 Sekunden</item>
@@ -181,7 +180,7 @@
     <string name="password_size_title">Generierte Passwortlänge</string>
     <string name="password_size_summary">Legt die Standardlänge des generierten Passworts fest</string>
     <string name="clipboard_notifications_title">Zwischenablagenbenachrichtigungen</string>
-    <string name="clipboard_notifications_summary">Benachrichtigungen für die Zwischenablage einschalten, um Felder eines Eintrags kopieren zu können.</string>
+    <string name="clipboard_notifications_summary">Benachrichtigungen für die Zwischenablage einschalten, um beim Anzeigen von Eingabefeldern diese kopieren zu können</string>
     <string name="lock_database_screen_off_title">Bildschirmsperre</string>
     <string name="lock_database_screen_off_summary">Datenbank sperren, wenn der Bildschirm ausgeschaltet wird</string>
     <string name="create_keepass_file">Neue Datenbank erstellen</string>
@@ -190,31 +189,31 @@
     <string name="path">Pfad</string>
     <string name="file_name">Dateiname</string>
     <string name="unavailable_feature_text">Dieses Feature konnte nicht gestartet werden.</string>
-    <string name="biometric_unlock_enable_summary">Ermöglicht die Datenbanköffnung mit dem Fingerabdruck</string>
+    <string name="biometric_unlock_enable_summary">Ermöglicht Ihre Biometrie zu scannen, um die Datenbank zu öffnen</string>
     <string name="advanced_unlock">Erweiterte Entsperrung</string>
-    <string name="biometric_unlock_enable_title">Fingerabdruckscanner</string>
+    <string name="biometric_unlock_enable_title">Biometrische Entsperrung</string>
     <string name="lock">Sperre</string>
     <string name="list_password_generator_options_summary">Erlaubte Zeichen für Passwortgenerator festlegen</string>
     <string name="list_password_generator_options_title">Passwortzeichen</string>
-    <string name="configure_biometric">Fingerabdruck-Scannen wird unterstützt, ist jedoch nicht konfiguriert.</string>
-    <string name="open_biometric_prompt_unlock_database">Fingerabdruck wird gescannt</string>
+    <string name="configure_biometric">Die biometrische Abfrage wird unterstützt, ist aber nicht eingerichtet.</string>
+    <string name="open_biometric_prompt_unlock_database">Biometrische Abfrage öffnen, um die Datenbank zu entsperren</string>
     <string name="encrypted_value_stored">Verschlüsseltes Passwort wurde gespeichert</string>
-    <string name="biometric_invalid_key">Fingerabdruckschlüssel nicht lesbar. Bitte das Passwort wiederherstellen.</string>
-    <string name="biometric_scanning_error">Problem mit dem Fingerabdruck: %1$s</string>
+    <string name="biometric_invalid_key">Biometrischer Schlüssel konnte nicht gelesen werden. Stellen Sie Ihre Anmeldedaten wieder her.</string>
+    <string name="biometric_scanning_error">Biometrischer Fehler: %1$s</string>
     <string name="database_history">Verlauf</string>
     <string name="general">Allgemein</string>
-    <string name="open_biometric_prompt_store_credential">Fingerabdruck verwenden, um dieses Passwort zu speichern</string>
+    <string name="open_biometric_prompt_store_credential">Biometrische Abfrage öffnen, um Anmeldedaten zu speichern</string>
     <string name="no_credentials_stored">Diese Datenbank hat noch kein Passwort.</string>
     <string name="style_choose_summary">App-Design, das in der App genutzt wird</string>
     <string name="encryption">Verschlüsselung</string>
     <string name="key_derivation_function">Schlüsselableitungsfunktion</string>
-    <string name="extended_ASCII">Erweitertes ASCII</string>
+    <string name="extended_ASCII">Erweiterte ASCII</string>
     <string name="allow">Erlauben</string>
     <string name="clipboard_swipe_clean">Wischen, um Zwischenablage jetzt zu leeren</string>
     <string name="error_autofill_enable_service">Autofill-Dienst kann nicht aktiviert werden.</string>
     <string name="copy_field">Kopie von %1$s</string>
     <string name="menu_form_filling_settings">Formularausfüllung</string>
-    <string name="menu_biometric_remove_key">Gespeicherten Fingerabdruck löschen</string>
+    <string name="menu_biometric_remove_key">Gespeicherten biometrischen Schlüssel löschen</string>
     <string name="encryption_explanation">Verschlüsselungsalgorithmus der Datenbank wird für sämtliche Daten verwendet.</string>
     <string name="kdf_explanation">Um den Schlüssel für den Verschlüsselungsalgorithmus zu generieren, wird der Hauptschlüssel umgewandelt, wobei ein zufälliger Salt in der Schlüsselberechnung verwendet wird.</string>
     <string name="memory_usage">Speichernutzung</string>
@@ -227,19 +226,19 @@
     <string name="sort_recycle_bin_bottom">Papierkorb unten</string>
     <string name="sort_title">Titel</string>
     <string name="sort_username">Benutzername</string>
-    <string name="sort_creation_time">Erzeugt am</string>
+    <string name="sort_creation_time">Erstelldatum</string>
     <string name="sort_last_modify_time">Änderungsdatum</string>
     <string name="sort_last_access_time">Zugriffsdatum</string>
-    <string name="biometric_not_recognized">Fingerabdruck nicht erkannt</string>
-    <string name="autofill">Auto-Einfügen</string>
+    <string name="biometric_not_recognized">Biometrische Daten nicht erkannt</string>
+    <string name="autofill">Autofill</string>
     <string name="autofill_service_name">KeePass DX autom. Formularausfüllung</string>
     <string name="autofill_sign_in_prompt">Mit KeePass DX anmelden</string>
-    <string name="set_autofill_service_title">Standard Autofill-Dienst auswählen</string>
+    <string name="set_autofill_service_title">Autofill-Dienstvorgabe festlegen</string>
     <string name="autofill_explanation_summary">Autofill aktivieren, um automatisch Eingabefelder in anderen Apps auszufüllen</string>
     <string name="clipboard">Zwischenablage</string>
     <string name="biometric_delete_all_key_title">Verschlüsselungsschlüssel löschen</string>
-    <string name="biometric_delete_all_key_summary">Alle Verschlüsselungsschlüssel für Fingerabdruckerkennung löschen</string>
-    <string name="biometric_delete_all_key_warning">Sollen wirklich alle mit der Fingerabdruckerkennung verknüpften Schlüssel gelöscht werden\?</string>
+    <string name="biometric_delete_all_key_summary">Alle Verschlüsselungsschlüssel für biometrischen Erkennung löschen</string>
+    <string name="biometric_delete_all_key_warning">Sind Sie sicher, dass Sie alle Schlüssel zur biometrischen Erkennung löschen möchten\?</string>
     <string name="unavailable_feature_version">Die Android-Version, %1$s, erfüllt nicht die Mindestanforderung für Version %2$s.</string>
     <string name="unavailable_feature_hardware">Keine entsprechende Hardware.</string>
     <string name="bytes">Bytes</string>
@@ -273,10 +272,10 @@
 \nGruppen (wie Ordner) helfen, Einträge in der Datenbank zu ordnen.</string>
     <string name="education_search_title">Einträge durchsuchen</string>
     <string name="education_search_summary">Titel, Benutzernamen oder Inhalte anderer Feldern eingeben, um die Passwörter wiederzufinden.</string>
-    <string name="education_biometric_title">Datenbank mit Fingerabdruck entsperren</string>
-    <string name="education_biometric_summary">Passwort und eigenen Fingerabdruck verknüpfen, um die Datenbank schnell zu entsperren.</string>
+    <string name="education_biometric_title">Datenbank-Entsperrung durch Biometrie</string>
+    <string name="education_biometric_summary">Verknüpft Ihr Passwort mit Ihrer gescannten Biometrie, um Ihre Datenbank schnell zu entsperren.</string>
     <string name="education_entry_edit_title">Eintrag bearbeiten</string>
-    <string name="education_entry_edit_summary">Einträge mit benutzerdefinierten Feldern bearbeiten. Pooldaten können zwischen verschiedenen Eingabefeldern referenziert werden.</string>
+    <string name="education_entry_edit_summary">Bearbeiten Sie Ihren Eintrag mit persönlichen Feldern. Persönliche Felder können mit Querverweisen aus anderen Einträgen ergänzt werden.</string>
     <string name="education_generate_password_title">Ein starkes Passwort für den Eintrag erstellen.</string>
     <string name="education_generate_password_summary">Erzeugung eines starken Passworts, das mit dem Eintrag verknüpft wird, nach Kriterien, die einfach in einem Formular festgelegt werden. Dabei an die Passwortsicherheit denken.</string>
     <string name="education_entry_new_field_title">Benutzerdefinierte Felder hinzufügen</string>
@@ -319,7 +318,7 @@
     <string name="menu_cancel">Abbrechen</string>
     <string name="clipboard_warning">Wenn das automatische Löschen der Zwischenablage fehlschlägt, bitte den Verlauf manuell löschen.</string>
     <string name="allow_copy_password_warning">WARNUNG: Alle Apps teilen sich die Zwischenablage. Wenn sensible Daten kopiert werden, kann andere Software darauf zugreifen.</string>
-    <string name="allow_no_password_title">Zulassen, dass kein Master-Passwort verwendet wird.</string>
+    <string name="allow_no_password_title">Entsperren ohne Hauptschlüssel</string>
     <string name="allow_no_password_summary">„Öffnen“-Taste aktivieren, wenn keine Passwort-Identifikation festgelegt ist</string>
     <string name="enable_education_screens_title">Hilfe-Anzeige</string>
     <string name="enable_education_screens_summary">Bedienelemente hervorheben, um die Funktionsweise der App zu lernen</string>
@@ -342,8 +341,8 @@
     <string name="keyboard_label">Magikeyboard (KeePass DX)</string>
     <string name="keyboard_setting_label">Magikeyboard-Einstellungen</string>
     <string name="keyboard_entry_category">Eintrag</string>
-    <string name="keyboard_entry_timeout_title">Zeitsperre</string>
-    <string name="keyboard_entry_timeout_summary">Zeit nach der Tastatureingaben gelöscht werden</string>
+    <string name="keyboard_entry_timeout_title">Timeout</string>
+    <string name="keyboard_entry_timeout_summary">Timeout zum Löschen der Tastatureingabe</string>
     <string name="keyboard_notification_entry_title">Benachrichtigung</string>
     <string name="keyboard_notification_entry_summary">Benachrichtigung anzeigen, wenn ein Eintrag abrufbar ist</string>
     <string name="keyboard_notification_entry_content_title_text">Eintrag</string>
@@ -358,7 +357,7 @@
     <string name="keyboard_key_sound_title">Ton bei Tastendruck</string>
     <string name="selection_mode">Auswahlmodus</string>
     <string name="do_not_kill_app">Nicht die App beenden …</string>
-    <string name="lock_database_back_root_summary">Schließe die Datenbank wenn auf der Startseite der Zurück-Button gedrückt wird</string>
+    <string name="lock_database_back_root_summary">Datenbank sperren, wenn auf dem Hauptbildschirm der Zurück-Button gedrückt wird</string>
     <string name="clear_clipboard_notification_title">Beim Schließen löschen</string>
     <string name="recycle_bin">Papierkorb</string>
     <string name="keyboard_selection_entry_title">Eintragsauswahl</string>
@@ -376,29 +375,76 @@
     <string name="content_description_add_field">Feld hinzufügen</string>
     <string name="content_description_remove_field">Feld entfernen</string>
     <string name="entry_UUID">UUID</string>
-    <string name="list_groups_show_number_entries_title">Zeige die Anzahl der Einträge</string>
-    <string name="list_groups_show_number_entries_summary">Zeige die Anzahl der Einträge in einer Gruppe</string>
+    <string name="list_groups_show_number_entries_title">Anzahl der Einträge anzeigen</string>
+    <string name="list_groups_show_number_entries_summary">Anzahl der Einträge in einer Gruppe anzeigen</string>
     <string name="content_description_add_node">Knoten hinzufügen</string>
-    <string name="lock_database_back_root_title">Drücke Zurück auf der Startseite zum Schließen</string>
+    <string name="lock_database_back_root_title">\"Zurück\" drücken, um zu sperren</string>
     <string name="clear_clipboard_notification_summary">Die Datenbank schließen, wenn die Benachrichtigung geschlossen wird</string>
     <string name="content_description_node_children">Untergeordneter Knotenpunkt</string>
     <string name="content_description_keyfile_checkbox">Schlüsseldatei-Kontrollkästchen</string>
-    <string name="error_move_entry_here">Eintrag kann nicht hierher verschoben werden.</string>
-    <string name="error_copy_entry_here">Eintrag kann nicht hierher kopiert werden.</string>
-    <string name="content_description_password_checkbox">Passwort-Kontrollkästchen</string>
+    <string name="error_move_entry_here">Du kannst keinen Eintrag hierher verschieben.</string>
+    <string name="error_copy_entry_here">Du kannst keinen Eintrag hierher kopieren.</string>
+    <string name="content_description_password_checkbox">Kontrollkästchen</string>
     <string name="content_description_repeat_toggle_password_visibility">Umschalten der Kennwortanzeige wiederholen</string>
     <string name="content_description_background">Hintergrund</string>
     <string name="content_description_update_from_list">Aktualisieren</string>
-    <string name="content_description_keyboard_close_fields">Fehler schließen</string>
+    <string name="content_description_keyboard_close_fields">Felder schließen</string>
     <string name="error_create_database_file">Es ist nicht möglich, eine Datenbank mit diesem Passwort und dieser Schlüsseldatei zu erstellen.</string>
     <string name="menu_advanced_unlock_settings">Erweiterte Entsperrung</string>
-    <string name="biometric_prompt_store_credential_title">Speichern der Fingerabdruck-Erkennung</string>
-    <string name="biometric_prompt_extract_credential_title">Datenbank mit Fingerabdruck-Erkennung öffnen</string>
-    <string name="biometric">Fingerabdruck</string>
+    <string name="biometric_prompt_store_credential_title">Biometrische Erkennung speichern</string>
+    <string name="biometric_prompt_extract_credential_title">Datenbank mit biometrische Erkennung öffnen</string>
+    <string name="biometric">Biometrisch</string>
     <string name="enable">Aktivieren</string>
     <string name="disable">Deaktivieren</string>
     <string name="biometric_prompt_store_credential_message">Datenbank-Anmeldeinformationen biometrisch speichern</string>
     <string name="biometric_prompt_extract_credential_message">Datenbank-Anmeldeinformationen mit biometrischen Daten extrahieren</string>
     <string name="biometric_auto_open_prompt_title">Biometrische Eingabeaufforderung automatisch öffnen</string>
     <string name="biometric_auto_open_prompt_summary">Biometrische Eingabeaufforderung automatisch öffnen, wenn ein biometrischer Schlüssel für eine Datenbank definiert ist</string>
+    <string name="master_key">Hauptschlüssel</string>
+    <string name="security">Sicherheit</string>
+    <string name="entry_history">Verlauf</string>
+    <string name="entry_setup_otp">Einmal-Passwort (OTP) einrichten</string>
+    <string name="otp_type">OTP-Typ</string>
+    <string name="otp_secret">Geheimnis</string>
+    <string name="otp_period">Zeitraum (Sekunden)</string>
+    <string name="otp_counter">Zähler</string>
+    <string name="otp_digits">Stellen</string>
+    <string name="otp_algorithm">Algorithmus</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Ungültiges OTP-Geheimnis.</string>
+    <string name="error_disallow_no_credentials">Mindestens eine Anmeldeinformation muss festgelegt sein.</string>
+    <string name="error_copy_group_here">Eine Gruppe kann nicht hierher kopiert werden.</string>
+    <string name="error_otp_secret_key">Geheimschlüssel muss im Base32-Format vorliegen.</string>
+    <string name="error_otp_counter">Zähler muss zwischen %1$d und %2$d eingestellt sein.</string>
+    <string name="error_otp_period">Zeitraum muss zwischen %1$d und %2$d Sekunden liegen.</string>
+    <string name="error_otp_digits">Token muss %1$d bis %2$d Stellen enthalten.</string>
+    <string name="invalid_db_same_uuid">%1$s mit derselben UUID %2$s existiert bereits.</string>
+    <string name="creating_database">Datenbank wird erstellt…</string>
+    <string name="menu_security_settings">Sicherheits-Einstellungen</string>
+    <string name="menu_master_key_settings">Hauptschlüssel-Einstellungen</string>
+    <string name="contains_duplicate_uuid">Die Datenbank enthält UUID-Duplikate.</string>
+    <string name="contains_duplicate_uuid_procedure">Durch die Validierung dieses Dialogs wird KeePass DX das Problem (durch Erzeugung neuer UUIDs für Duplikate) beheben und weiter ausgeführt.</string>
+    <string name="database_opened">Datenbank geöffnet</string>
+    <string name="clipboard_explanation_summary">Eintragsfelder mithilfe der Zwischenablage des Geräts kopieren</string>
+    <string name="persistent_notification_title">Dauerhafte Benachrichtigung</string>
+    <string name="persistent_notification_summary">Bei geöffneter Datenbank eine Benachrichtigung hinzufügen</string>
+    <string name="advanced_unlock_explanation_summary">Erweitertes Entsperren verwenden, um eine Datenbank einfacher zu öffnen</string>
+    <string name="database_data_compression_title">Datenkompression</string>
+    <string name="database_data_compression_summary">Datenkompression reduziert die Datenbankgröße.</string>
+    <string name="max_history_items_title">Max. Verlaufseinträge</string>
+    <string name="max_history_items_summary">Anzahl der Verlaufseinträge pro Eintrag begrenzen</string>
+    <string name="max_history_size_title">Max. Verlaufsumfang</string>
+    <string name="max_history_size_summary">Verlaufsumfang pro Eintrag (in binären Bytes) begrenzen</string>
+    <string name="settings_database_recommend_changing_master_key_title">Änderung empfehlen</string>
+    <string name="settings_database_recommend_changing_master_key_summary">(Nach Tagen) Änderung des Hauptschlüssels empfehlen</string>
+    <string name="settings_database_force_changing_master_key_title">Änderung erzwingen</string>
+    <string name="settings_database_force_changing_master_key_summary">(Nach Tagen) Änderung des Hauptschlüssels erzwingen</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Änderung beim nächsten Mal erzwingen</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Änderung des Hauptschlüssels beim nächsten Mal erzwingen (einmalig)</string>
+    <string name="database_default_username_title">Vorgegebener Benutzername</string>
+    <string name="database_custom_color_title">Benutzerdefinierte Datenbankfarbe</string>
+    <string name="compression">Kompression</string>
+    <string name="compression_none">Keine</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Gerätetastatur-Einstellungen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 75aebbdbb..f167dacd9 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+--><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="about_feedback">Commentaires</string>
     <string name="about_homepage">Site Web</string>
     <string name="about_description">Implémentation Android du gestionnaire de mots de passe KeePass</string>
@@ -119,7 +118,7 @@
     <string name="menu_open">Ouvrir</string>
     <string name="menu_search">Rechercher</string>
     <string name="menu_showpass">Afficher le mot de passe</string>
-    <string name="menu_biometric_remove_key">Supprimer l’empreinte digitale enregistrée</string>
+    <string name="menu_biometric_remove_key">Supprimer l’empreinte biométrique enregistrée</string>
     <string name="menu_url">Ouvrir l’URL</string>
     <string name="minus">Moins</string>
     <string name="never">Jamais</string>
@@ -203,12 +202,12 @@
     <string name="lock">Verrouiller</string>
     <string name="lock_database_screen_off_title">Verrouillage d’écran</string>
     <string name="lock_database_screen_off_summary">Verrouiller la base de données lorsque l’écran est éteint</string>
-    <string name="advanced_unlock">Empreinte digitale</string>
-    <string name="biometric_unlock_enable_title">Reconnaissance d’empreinte digitale</string>
-    <string name="biometric_unlock_enable_summary">Vous permet de numériser votre empreinte digitale pour ouvrir la base de données</string>
+    <string name="advanced_unlock">Déverouillage avancée</string>
+    <string name="biometric_unlock_enable_title">Déverouillage biométrique</string>
+    <string name="biometric_unlock_enable_summary">Vous permet de numériser votre empreinte biométrique pour ouvrir la base de données</string>
     <string name="biometric_delete_all_key_title">Supprimer les clés de chiffrement</string>
-    <string name="biometric_delete_all_key_summary">Supprimer toutes les clés de chiffrement liées à la reconnaissance d’empreinte digitale</string>
-    <string name="biometric_delete_all_key_warning">Êtes-vous sûr de vouloir supprimer toutes les clés liées à la reconnaissance d’empreinte digitale \?</string>
+    <string name="biometric_delete_all_key_summary">Supprimer toutes les clés de chiffrement liées à la reconnaissance biométrique</string>
+    <string name="biometric_delete_all_key_warning">Êtes-vous sûr de vouloir supprimer toutes les clés liées à la reconnaissance biométrique \?</string>
     <string name="unavailable_feature_text">Impossible de démarrer cette fonctionnalité.</string>
     <string name="unavailable_feature_version">Votre version Android %1$s est inférieure à la version minimale %2$s requise.</string>
     <string name="unavailable_feature_hardware">Impossible de trouver le matériel correspondant.</string>
@@ -250,8 +249,8 @@
 \nLes groupes (~ dossiers) organisent les entrées dans votre base de données.</string>
     <string name="education_search_title">Rechercher dans les entrées</string>
     <string name="education_search_summary">Entrer le titre, le nom d’utilisateur ou le contenu des autres champs pour récupérer vos mots de passe.</string>
-    <string name="education_biometric_title">Déverrouillage de la base de données par empreinte digitale</string>
-    <string name="education_biometric_summary">Associer votre mot de passe à votre empreinte digitale numérisée pour déverrouiller rapidement votre base de données.</string>
+    <string name="education_biometric_title">Déverrouillage de la base de données par biométrique</string>
+    <string name="education_biometric_summary">Associer votre mot de passe à votre empreinte biométrique numérisée pour déverrouiller rapidement votre base de données.</string>
     <string name="education_entry_edit_title">Modifier l’entrée</string>
     <string name="education_entry_edit_summary">Modifier votre entrée avec des champs personnalisés. La collection de données peut être référencée entre différents champs de l’entrée.</string>
     <string name="education_generate_password_title">Créer un mot de passe fort pour votre entrée.</string>
@@ -291,7 +290,7 @@
     <string name="encryption_twofish">Twofish</string>
     <string name="encryption_chacha20">ChaCha20</string>
     <!-- Key Derivation Functions -->
-    <string name="kdf_AES">Fonction de dérivation de clé AES</string>
+    <string name="kdf_AES">AES KDF</string>
     <string name="kdf_Argon2">Argon2</string>
     <string-array name="timeout_options">
         <item>5 secondes</item>
@@ -333,10 +332,9 @@
     <string name="enable_read_only_title">Protégé en écriture</string>
     <string name="enable_read_only_summary">Ouvrir votre base de données en lecture seule par défaut</string>
     <string name="education_read_only_title">Protéger en écriture votre base de données</string>
-    <string name="education_read_only_summary">Changer le mode d’ouverture pour la session.
-\n
-\n« Protégé en écriture » empêche les modifications involontaires de la base de données.
-\n
+    <string name="education_read_only_summary">Changer le mode d’ouverture pour la session. 
+\n 
+\n« Protégé en écriture » empêche les modifications involontaires de la base de données. 
 \n« Modifiable » vous permet d’ajouter, de supprimer ou de modifier tous les éléments.</string>
     <string name="edit_entry">Modifier l’entrée</string>
     <string name="error_load_database">Impossible de charger votre base de données.</string>
@@ -364,7 +362,7 @@
     <string name="keyboard_key_sound_title">Son au toucher</string>
     <string name="selection_mode">Mode sélection</string>
     <string name="do_not_kill_app">Ne pas tuer l\'application…</string>
-    <string name="lock_database_back_root_title">Déverouillage du bouton retour</string>
+    <string name="lock_database_back_root_title">Appuyer sur \"Retour\" pour verouiller</string>
     <string name="lock_database_back_root_summary">Verrouille la base de données lorsque l\'utilisateur clique sur le bouton Précédent de l\'écran racine</string>
     <string name="clear_clipboard_notification_title">Suppression à la fermeture</string>
     <string name="clear_clipboard_notification_summary">Ferme la base de données lors de la fermeture de notification</string>
@@ -407,4 +405,51 @@
     <string name="biometric">Biométrique</string>
     <string name="biometric_auto_open_prompt_title">Ouvrir automatiquement la boite de dialogue biométrique</string>
     <string name="biometric_auto_open_prompt_summary">Ouvrir automatiquement la boite de dialogue biométrique lorsqu\'une clé biométrique est définie pour une base de données</string>
+    <string name="master_key">Clé Maîtresse</string>
+    <string name="security">Sécurité</string>
+    <string name="entry_history">Historique</string>
+    <string name="entry_setup_otp">Configuration d\'un mot de passe à usage unique</string>
+    <string name="otp_type">Type OTP</string>
+    <string name="otp_secret">Secret</string>
+    <string name="otp_period">Période (Secondes)</string>
+    <string name="otp_counter">Compteur</string>
+    <string name="otp_digits">Chiffres</string>
+    <string name="otp_algorithm">Algorithme</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Secret OTP invalide.</string>
+    <string name="error_disallow_no_credentials">Au moins un identifiant doit être défini.</string>
+    <string name="error_copy_group_here">Vous ne pouvez pas copier un groupe ici.</string>
+    <string name="error_otp_secret_key">La clé secrète doit être au format Base32.</string>
+    <string name="error_otp_counter">Le compteur doit être entre %1$d et %2$d.</string>
+    <string name="error_otp_period">La période doit être entre %1$d et %2$d secondes.</string>
+    <string name="error_otp_digits">Le token doit contenir de %1$d à %2$d chiffres.</string>
+    <string name="invalid_db_same_uuid">%1$s avec le même UUID %2$s existe déjà.</string>
+    <string name="creating_database">Création de base de données…</string>
+    <string name="menu_security_settings">Paramètres de sécurité</string>
+    <string name="menu_master_key_settings">Paramètres de clé maîtresse</string>
+    <string name="contains_duplicate_uuid">La base de données contient des UUID en double.</string>
+    <string name="contains_duplicate_uuid_procedure">En validant cette boîte de dialogue, KeePass DX corrigera le problème (en générant de nouveaux UUID pour les doublons) et continuera.</string>
+    <string name="database_opened">Base de données ouverte</string>
+    <string name="clipboard_explanation_summary">Copier les champs de saisie à l\'aide du presse-papiers de votre appareil</string>
+    <string name="persistent_notification_title">Notification persistante</string>
+    <string name="persistent_notification_summary">Ajouter une notification lorsque la base de données est ouverte</string>
+    <string name="advanced_unlock_explanation_summary">Utilisez le déverrouillage avancé pour ouvrir plus facilement une base de données</string>
+    <string name="database_data_compression_title">Compression de données</string>
+    <string name="database_data_compression_summary">La compression des données réduit la taille de la base de données.</string>
+    <string name="max_history_items_title">Eléments d\'historique max.</string>
+    <string name="max_history_items_summary">Limiter le nombre d\'éléments d\'historique par entrée</string>
+    <string name="max_history_size_title">Taille de l\'historique max.</string>
+    <string name="max_history_size_summary">Limiter la taille de l\'historique par entrée (en octets binaires)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Recommander changement</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Recommander le changement de clé maîtresse (jours)</string>
+    <string name="settings_database_force_changing_master_key_title">Forcer changement</string>
+    <string name="settings_database_force_changing_master_key_summary">Force le changement de clé maîtresse (jours)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Force changement la prochaine fois</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Force le changement de clé maîtresse la prochaine fois (une fois)</string>
+    <string name="database_default_username_title">Nom d\'utilisateur par défaut</string>
+    <string name="database_custom_color_title">Couleur de base de données personnalisée</string>
+    <string name="compression">Compression</string>
+    <string name="compression_none">Aucune</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Paramètres clavier de l\'appareil</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 045e125f3..075c1405b 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -1,3 +1,96 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-</resources>
+    <string name="about_feedback">प्रतिक्रिया</string>
+    <string name="about_homepage">होमपेज</string>
+    <string name="about_description">एंड्रॉयड पर आधारित KeePass पासवर्ड मैनेजर</string>
+    <string name="accept">स्वीकार</string>
+    <string name="add_entry">रिकॉर्ड जोड़ें</string>
+    <string name="edit_entry">रिकॉर्ड संपादित करें</string>
+    <string name="add_group">समूह जोड़ें</string>
+    <string name="encryption">एन्क्रिप्शन</string>
+    <string name="encryption_algorithm">एन्क्रिप्शन एल्गोरिथम</string>
+    <string name="key_derivation_function">कुंजी उत्पत्ति कृत्य</string>
+    <string name="app_timeout">ऐप का समय समाप्त</string>
+    <string name="app_timeout_summary">ऐप लॉक होने से पहले निष्क्रियता</string>
+    <string name="application">ऐप</string>
+    <string name="beta_dontask">फिर मत दिखाना</string>
+    <string name="brackets">कोष्ठक</string>
+    <string name="extended_ASCII">विस्तारित ASCII</string>
+    <string name="allow">अनुमति दें</string>
+    <string name="clipboard_cleared">क्लिपबोर्ड साफ कर दिया</string>
+    <string name="clipboard_error_title">क्लिपबोर्ड त्रुटि</string>
+    <string name="clipboard_error">सैमसंग के कुछ एंड्रॉइड फोन क्लिपबोर्ड का उपयोग नहीं करने देंगे।</string>
+    <string name="clipboard_error_clear">क्लिपबोर्ड को साफ़ नहीं किया जा सका</string>
+    <string name="clipboard_timeout">क्लिपबोर्ड टाइमआउट</string>
+    <string name="clipboard_timeout_summary">क्लिपबोर्ड में भंडारण की अवधि</string>
+    <string name="clipboard_swipe_clean">अब क्लिपबोर्ड को साफ करने के लिए स्वाइप करें</string>
+    <string name="select_to_copy">क्लिपबोर्ड पर% 1 $ s को कॉपी करने के लिए चयन करें</string>
+    <string name="retrieving_db_key">डेटाबेस कुंजी पुनर्प्राप्त कर रहा है…</string>
+    <string name="database">डेटाबेस</string>
+    <string name="decrypting_db">डेटाबेस सामग्री डिक्रिप्टिंग…</string>
+    <string name="default_checkbox">डिफ़ॉल्ट डेटाबेस के रूप में उपयोग करें</string>
+    <string name="digits">अंक</string>
+    <string name="disclaimer_formal">KeePass DX © %1 $ डी Kunzisoft बिल्कुल कोई वारंटी के साथ आता है । यह लाइब्रे सॉफ्टवेयर है, और जीपीएल संस्करण 3 या बाद की शर्तों के तहत इसे पुनर्वितरित करने के लिए आपका स्वागत है।</string>
+    <string name="entry_accessed">एक्सेस किया गया</string>
+    <string name="entry_cancel">रद्द करें</string>
+    <string name="entry_notes">टिप्पणियाँ</string>
+    <string name="entry_confpassword">पासवर्ड की पुष्टि करें</string>
+    <string name="entry_created">बनाया</string>
+    <string name="entry_expires">समयसीमा समाप्त</string>
+    <string name="entry_keyfile">कीफाइल</string>
+    <string name="entry_modified">संशोधित</string>
+    <string name="entry_not_found">प्रवेश का डाटा नहीं मिल सका।</string>
+    <string name="entry_password">पासवर्ड</string>
+    <string name="entry_save">सहेजें</string>
+    <string name="entry_title">शीर्षक</string>
+    <string name="entry_url">यू.आर.एल</string>
+    <string name="entry_user_name">उपयोगकर्ता का नाम</string>
+    <string name="error_can_not_handle_uri">KeePass DX में इस URI को संभाल नहीं सका।</string>
+    <string name="error_file_not_create">फाइल नहीं बना सका:</string>
+    <string name="error_invalid_db">डाटाबेस नहीं पढ़ सका।</string>
+    <string name="error_invalid_path">सुनिश्चित करें कि रास्ता सही है।</string>
+    <string name="error_no_name">एक नाम दर्ज करें।</string>
+    <string name="error_nokeyfile">कीफाइल का चयन करें।</string>
+    <string name="error_out_of_memory">आपके पूरे डेटाबेस को लोड करने के लिए कोई मेमोरी नहीं।</string>
+    <string name="error_load_database">आपके डेटाबेस को लोड नहीं किया जा सका।</string>
+    <string name="error_load_database_KDF_memory">कुंजी लोड नहीं कर सका। केडीएफ \"मेमोरी उपयोग\" को कम करने का प्रयास करें।</string>
+    <string name="error_pass_gen_type">कम से कम एक पासवर्ड जनरेशन प्रकार का चयन करना होगा।</string>
+    <string name="error_pass_match">पासवर्ड मेल नहीं खाते हैं।</string>
+    <string name="error_rounds_too_large">\"परिवर्तन राउंड\" बहुत अधिक है। 2147483648 पर सेट हो रहा है।</string>
+    <string name="error_string_key">प्रत्येक स्ट्रिंग में फ़ील्ड नाम होना चाहिए।</string>
+    <string name="error_title_required">एक शीर्षक जोड़ें।</string>
+    <string name="content_description_open_file">फ़ाइल खोलें</string>
+    <string name="content_description_node_children">नोड के बच्चे</string>
+    <string name="content_description_add_node">नोड जोड़ें</string>
+    <string name="content_description_add_entry">रिकॉर्ड जोड़ें</string>
+    <string name="content_description_add_group">समूह जोड़ें</string>
+    <string name="content_description_file_information">फ़ाइल की जानकारी</string>
+    <string name="content_description_password_checkbox">पासवर्ड चेकबॉक्स</string>
+    <string name="content_description_keyfile_checkbox">कीफाइल चेकबॉक्स</string>
+    <string name="content_description_repeat_toggle_password_visibility">पासवर्ड दृश्यता टॉगल दोहराएं</string>
+    <string name="content_description_entry_icon">प्रवेश आइकन</string>
+    <string name="content_description_entry_save">प्रविष्टि सहेजें</string>
+    <string name="content_description_password_generator">पासवर्ड जनरेटर</string>
+    <string name="content_description_password_length">पासवर्ड की लंबाई</string>
+    <string name="content_description_add_field">फ़ील्ड जोड़ें</string>
+    <string name="content_description_remove_field">फ़ील्ड निकालें</string>
+    <string name="entry_UUID">UUID</string>
+    <string name="file_manager_install_description">"डेटाबेस फाइल को बनाने खोलने और सेव करने के लिए  आपके फोन में फाइल मैनेजर ऐप होना चाहिए जोकि दिए गए एक्शन को सपोर्ट कर सके ACTION_CREATE_DOCUMENT और ACTION_OPEN_DOCUMENT"</string>
+    <string name="content_description_background">पृष्ठभूमि</string>
+    <string name="content_description_update_from_list">अपडेट करें</string>
+    <string name="content_description_remove_from_list">निकालें</string>
+    <string name="content_description_keyboard_close_fields">बंद क्षेत्र</string>
+    <string name="master_key">मास्टर कुंजी</string>
+    <string name="security">सुरक्षा</string>
+    <string name="entry_history">इतिहास</string>
+    <string name="entry_setup_otp">सेटअप वन-टाइम पासवर्ड</string>
+    <string name="otp_type">ओटीपी प्रकार</string>
+    <string name="otp_secret">गुप्त</string>
+    <string name="otp_period">अवधि (सेकंड)</string>
+    <string name="otp_counter">काउंटर</string>
+    <string name="otp_digits">अंक</string>
+    <string name="otp_algorithm">एल्गोरिथ्म</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">अमान्य ओटीपी गुप्त।</string>
+    <string name="error_disallow_no_credentials">कम से कम एक क्रेडेंशियल सेट किया जाना चाहिए।</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 72fec885e..9cddb9ed6 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -294,11 +294,9 @@
     <string name="education_donation_title">Delta</string>
     <string name="education_donation_summary">Delta for å øke stabiliteten, sikkerheten, og med å legge til flere funksjoner.</string>
     <string name="html_text_ad_free">Ulikt mange passordbehandlingsprogrammer, er dette <strong>reklamefri</strong>, <strong>copyleftbasert fri programvare</strong> og samler ikke inn personlig data på tjenerne sine, selv i sin gratisversjon.</string>
-    <string name="html_text_buy_pro">Ved kjøp av pro-versjonen, vil du få tilgang til denne <strong>visuelle funksjonen</strong> og du vil spesielt hjelpe <strong> realiseringen av gemenskapsprosjekter.</strong>
-    </string>
+    <string name="html_text_buy_pro">Ved kjøp av pro-versjonen, vil du få tilgang til denne <strong>visuelle funksjonen</strong> og du vil spesielt hjelpe <strong> realiseringen av gemenskapsprosjekter.</strong></string>
     <string name="html_text_feature_generosity">Denne <strong>visuelle funksjonen</strong> er tilgjengelig takket være din generøsitet.</string>
-    <string name="html_text_donation">For å beholde vår frihet og alltid være aktive, stoler vi på dine <strong>bidrag.</strong>
-    </string>
+    <string name="html_text_donation">For å beholde vår frihet og alltid være aktive, stoler vi på dine <strong>bidrag.</strong></string>
     <string name="html_text_dev_feature">Denne funksjonen er <strong>under utvikling</strong> og krever <strong>bidrag</strong> for å bli tilgjengelig snart.</string>
     <string name="html_text_dev_feature_buy_pro">Ved å kjøpe <strong>pro</strong>-versjonen,</string>
     <string name="html_text_dev_feature_contibute">Ved å <strong>bidra</strong>,</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index a3a0fa60d..3b7d63224 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -18,8 +18,7 @@
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 
     Dutch translation by Erik Devriendt, corrected by Erik Jan Meijer
--->
-<resources>
+--><resources>
     <string name="about_feedback">Reacties</string>
     <string name="about_homepage">Website</string>
     <string name="about_description">Android-implementatie van de KeePass-wachtwoordbeheerder</string>
@@ -240,7 +239,7 @@
     <string name="lock_database_screen_off_summary">Databank vergrendelen als het scherm uitgaat</string>
     <string name="advanced_unlock">Vingerafdruk</string>
     <string name="biometric_unlock_enable_title">Vingerafdrukherkenning</string>
-    <string name="biometric_unlock_enable_summary">Hiermee wordt je vingerafdruk gebruikt om de databank te openen</string>
+    <string name="biometric_unlock_enable_summary">Laat u uw biometrische gegevens scannen om de database te openen</string>
     <string name="biometric_delete_all_key_title">Sleutels voor versleuteling verwijderen</string>
     <string name="biometric_delete_all_key_summary">Alle aan vingerafdrukherkenning gerelateerde sleutels wilt verwijderen</string>
     <string name="biometric_delete_all_key_warning">Weet je zeker dat je alle sleutels van de vingerafdrukherkenning wilt verwijderen\?</string>
@@ -296,7 +295,7 @@
     <string name="education_generate_password_title">Genereer een sterk wachtwoord voor het item.</string>
     <string name="education_generate_password_summary">Genereer een sterk wachtwoord om aan het item te koppelen, definieer het eenvoudig volgens de criteria van het formulier en vergeet het veilige wachtwoord niet.</string>
     <string name="education_entry_new_field_title">Voeg aangepaste velden toe</string>
-    <string name="education_entry_new_field_summary">Je kan een nieuw, aanvullend veld aanmaken en tevens beschermen.</string>
+    <string name="education_entry_new_field_summary">Registreer een aanvullend veld door een nieuw aan te maken en dit tevens te beschermen.</string>
     <string name="education_unlock_title">Ontgrendel je databank</string>
     <string name="education_read_only_title">Databank alleen-lezen</string>
     <string name="education_read_only_summary">Wijzig de opstartmodus van de sessie.
@@ -357,7 +356,7 @@
     <string name="keyboard_key_sound_title">Geluid bij toetsaanslag</string>
     <string name="selection_mode">Selectiemodus</string>
     <string name="do_not_kill_app">App niet afsluiten…</string>
-    <string name="lock_database_back_root_title">Druk op Terug om te vergrendelen</string>
+    <string name="lock_database_back_root_title">Druk op \'Terug\' om te vergrendelen</string>
     <string name="lock_database_back_root_summary">Vergrendel de databank wanneer de gebruiker op de knop Terug in het hoofdscherm klikt</string>
     <string name="clear_clipboard_notification_title">Wissen bij afsluiten</string>
     <string name="clear_clipboard_notification_summary">Sluit de databank tegelijk met de melding</string>
@@ -367,7 +366,7 @@
     <string name="delete_entered_password_title">Wachtwoord wissen</string>
     <string name="delete_entered_password_summary">Wist het ingevoerde wachtwoord na een verbindingspoging</string>
     <string name="content_description_open_file">Bestand openen</string>
-    <string name="content_description_node_children">Items onder het knooppunt</string>
+    <string name="content_description_node_children">Onderliggende items</string>
     <string name="content_description_add_node">Knooppunt toevoegen</string>
     <string name="content_description_add_entry">Item toevoegen</string>
     <string name="content_description_add_group">Groep toevoegen</string>
@@ -386,4 +385,65 @@
     <string name="error_copy_entry_here">Je kan hier geen item kopiëren.</string>
     <string name="list_groups_show_number_entries_title">Het aantal items tonen</string>
     <string name="list_groups_show_number_entries_summary">Toon het aantal items in een groep</string>
+    <string name="content_description_background">Achtergrond</string>
+    <string name="content_description_update_from_list">Update</string>
+    <string name="content_description_keyboard_close_fields">Velden sluiten</string>
+    <string name="error_create_database_file">Kan geen database aanmaken met dit wachtwoord en sleutelbestand.</string>
+    <string name="menu_advanced_unlock_settings">Geavanceerd ontgrendelen</string>
+    <string name="biometric_prompt_store_credential_title">Biometrische herkenning opslaan</string>
+    <string name="biometric_prompt_store_credential_message">Databasereferenties opslaan met biometrische gegevens</string>
+    <string name="biometric_prompt_extract_credential_title">Database met biometrische herkenning openen</string>
+    <string name="biometric_prompt_extract_credential_message">Database-referenties uitpakken met biometrische gegevens</string>
+    <string name="biometric">Biometrisch</string>
+    <string name="biometric_auto_open_prompt_title">Automatisch biometrische prompt openen</string>
+    <string name="biometric_auto_open_prompt_summary">Biometrische prompt automatisch openen wanneer een biometrische sleutel is gedefinieerd voor een database</string>
+    <string name="enable">Inschakelen</string>
+    <string name="disable">Uitschakelen</string>
+    <string name="master_key">Hoofdsleutel</string>
+    <string name="security">Beveiliging</string>
+    <string name="entry_history">Geschiedenis</string>
+    <string name="entry_setup_otp">Eenmalig wachtwoord (OTP) instellen</string>
+    <string name="otp_type">OTP-type</string>
+    <string name="otp_secret">Geheim</string>
+    <string name="otp_period">Duur (seconden)</string>
+    <string name="otp_counter">Teller</string>
+    <string name="otp_digits">Cijfers</string>
+    <string name="otp_algorithm">Algoritme</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Ongeldig OTP-geheim.</string>
+    <string name="error_disallow_no_credentials">Tenminste één referentie moet worden ingesteld.</string>
+    <string name="error_copy_group_here">Je kunt hier geen groep kopiëren.</string>
+    <string name="error_otp_secret_key">Geheime sleutel moet in Base32-indeling zijn.</string>
+    <string name="error_otp_counter">Teller moet tussen %1$d en %2$d liggen.</string>
+    <string name="error_otp_period">De duur moet tussen %1$d en %2$d seconden liggen.</string>
+    <string name="error_otp_digits">Token moet %1$d tot %2$d cijfers bevatten.</string>
+    <string name="invalid_db_same_uuid">%1$s met dezelfde UUID %2$s bestaat al.</string>
+    <string name="creating_database">Database aanmaken …</string>
+    <string name="menu_security_settings">Beveiligingsinstellingen</string>
+    <string name="menu_master_key_settings">Instellingen hoofdsleutel</string>
+    <string name="contains_duplicate_uuid">De database bevat dubbele UUID\'s.</string>
+    <string name="contains_duplicate_uuid_procedure">Door dit dialoogvenster te valideren, zal KeePassDX het probleem oplossen (door nieuwe UUID\'s voor duplicaten te genereren) en doorgaan.</string>
+    <string name="database_opened">Database geopend</string>
+    <string name="clipboard_explanation_summary">Kopieer invoervelden met behulp van het klembord van uw apparaat</string>
+    <string name="persistent_notification_title">Aanhoudende melding</string>
+    <string name="persistent_notification_summary">Voeg een melding toe wanneer de database is geopend</string>
+    <string name="advanced_unlock_explanation_summary">Geavanceerde ontgrendeling gebruiken om een database gemakkelijker te openen</string>
+    <string name="database_data_compression_title">Gegevenscompressie</string>
+    <string name="database_data_compression_summary">Gegevenscompressie verkleint de omvang van de database.</string>
+    <string name="max_history_items_title">Max. geschiedenis items</string>
+    <string name="max_history_items_summary">Beperk het aantal geschiedenisitems per item</string>
+    <string name="max_history_size_title">Max. grootte van de geschiedenis</string>
+    <string name="max_history_size_summary">Grootte van geschiedenis beperken per invoer (in binaire bytes)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Aanbevolen wijzigen</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Aanbeveling de hoofdsleutel te wijzigen (dagen)</string>
+    <string name="settings_database_force_changing_master_key_title">Wijziging afdwingen</string>
+    <string name="settings_database_force_changing_master_key_summary">De hoofdsleutel verplicht wijzigen (dagen)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Volgende keer verplicht wijzigen</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Het hoofdwachtwoord de volgende keer verplicht wijzigen (eenmalig)</string>
+    <string name="database_default_username_title">Standaard gebruikersnaam</string>
+    <string name="database_custom_color_title">Aangepaste databasekleur</string>
+    <string name="compression">Compressie</string>
+    <string name="compression_none">Geen</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Toetsenbordinstellingen voor apparaat</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4870a7144..c0f99c347 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
+--><resources>
     <string name="about_feedback">Informacje zwrotne</string>
     <string name="about_homepage">Strona domowa</string>
     <string name="about_description">Implementacja Android dla menedżera haseł KeePass</string>
@@ -238,7 +237,7 @@
     <string name="lock_database_screen_off_summary">Zablokuj bazę danych, gdy ekran jest wyłączony</string>
     <string name="advanced_unlock">Odcisk palca</string>
     <string name="biometric_unlock_enable_title">Skanowanie odcisków palców</string>
-    <string name="biometric_unlock_enable_summary">Umożliwia skanowanie odcisku palca w celu otwarcia bazy danych</string>
+    <string name="biometric_unlock_enable_summary">Umożliwia zeskanowanie danych biometrycznych w celu otwarcia bazy danych</string>
     <string name="biometric_delete_all_key_title">Usuń klucze szyfrowania</string>
     <string name="biometric_delete_all_key_summary">Usuń wszystkie klucze szyfrowania związane z rozpoznawaniem linii papilarnych</string>
     <string name="biometric_delete_all_key_warning">Czy na pewno chcesz usunąć wszystkie klucze związane z rozpoznawaniem linii papilarnych\?</string>
@@ -313,11 +312,9 @@
     <string name="education_donation_title">Weź udział</string>
     <string name="education_donation_summary">Pomóż zwiększyć stabilność, bezpieczeństwo i dodawanie kolejnych funkcji.</string>
     <string name="html_text_ad_free">W przeciwieństwie do wielu aplikacji do zarządzania hasłami, ta jest <strong>wolna od reklam</strong>, jest oprogramowaniem darmowym typu <strong>copylefted libre</strong> i nie zbiera danych osobowych na swoich serwerach, bez względu na to, jakiej wersji używasz.</string>
-    <string name="html_text_buy_pro">Kupując wersję pro, będziesz mieć dostęp do tej <strong>funkcji wizualnej</strong> a szczególnie pomożesz <strong> zrealizować projekty społecznościowe. </strong>
-    </string>
+    <string name="html_text_buy_pro">Kupując wersję pro, będziesz mieć dostęp do tej <strong>funkcji wizualnej</strong> a szczególnie pomożesz <strong> zrealizować projekty społecznościowe.</strong></string>
     <string name="html_text_feature_generosity">Ta <strong>funkcja wizualna</strong> jest dostępna dzięki Twojej hojności.</string>
-    <string name="html_text_donation">Aby zachować naszą wolność i być zawsze aktywnym, liczymy na Twój <strong>wkład.</strong>
-    </string>
+    <string name="html_text_donation">Aby zachować naszą wolność i być zawsze aktywnym, liczymy na Twój <strong>wkład.</strong></string>
     <string name="html_text_dev_feature">Ta funkcja jest <strong>rozwojowa</strong> i wymaga twojego <strong>wkładu</strong> aby być wkrótce dostępną.</string>
     <string name="html_text_dev_feature_buy_pro">Kupując wersję <strong>pro</strong> wersja,</string>
     <string name="html_text_dev_feature_contibute">Przez <strong>przyczynianie się</strong>,</string>
@@ -354,7 +351,7 @@
     <string name="keyboard_key_vibrate_title">Wibracja po naciśnięciu klawisza</string>
     <string name="keyboard_key_sound_title">Dźwięk przy naciśnięciu</string>
     <string name="do_not_kill_app">Nie zabijaj aplikacji…</string>
-    <string name="lock_database_back_root_title">Naciśnij Wstecz na stronie głównej, aby zablokować</string>
+    <string name="lock_database_back_root_title">Wciśnij \'Powrót\', aby zablokować</string>
     <string name="lock_database_back_root_summary">Zablokuj bazę danych, gdy użytkownik kliknie przycisk \"Wstecz\" na ekranie głównym</string>
     <string name="clear_clipboard_notification_title">Wyczyść po zamknięciu</string>
     <string name="clear_clipboard_notification_summary">Zamknij bazę danych podczas zamykania powiadomienia</string>
@@ -398,4 +395,51 @@
     <string name="disable">Wyłącz</string>
     <string name="biometric_auto_open_prompt_summary">Automatycznie otwieraj monit biometryczny, gdy klucz biometryczny jest zdefiniowany dla bazy danych</string>
     <string name="content_description_node_children">Węzły podrzędne</string>
+    <string name="master_key">Klucz główny</string>
+    <string name="security">Zabezpieczenia</string>
+    <string name="entry_history">Historia</string>
+    <string name="entry_setup_otp">Ustaw hasło jednorazowe</string>
+    <string name="otp_type">Typ OTP</string>
+    <string name="otp_secret">Tajne</string>
+    <string name="otp_period">Okres (w sekundach)</string>
+    <string name="otp_counter">Licznik</string>
+    <string name="otp_digits">Cyfry</string>
+    <string name="otp_algorithm">Algorytm</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_copy_group_here">Nie można tutaj skopiować wpisu.</string>
+    <string name="creating_database">Tworzenie bazy danych…</string>
+    <string name="menu_security_settings">Ustawienia zabezpieczeń</string>
+    <string name="menu_master_key_settings">Ustawienia klucza głównego</string>
+    <string name="contains_duplicate_uuid">Baza danych zawiera zduplikowane identyfikatory UUID.</string>
+    <string name="database_opened">Baza danych otwarta</string>
+    <string name="persistent_notification_title">Stałe powiadamianie</string>
+    <string name="persistent_notification_summary">Dodaj powiadomienie, gdy baza danych jest otwarta</string>
+    <string name="database_data_compression_title">Kompresja danych</string>
+    <string name="max_history_items_summary">Ogranicz liczbę elementów historii na wpis</string>
+    <string name="max_history_size_title">Max. rozmiar historii</string>
+    <string name="settings_database_recommend_changing_master_key_title">Zalecane zmiany</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Zaleca się zmianę klucza głównego (dni)</string>
+    <string name="settings_database_force_changing_master_key_summary">Wymuś zmianę klucza głównego (dni)</string>
+    <string name="database_default_username_title">Domyślna nazwa użytkownika</string>
+    <string name="database_custom_color_title">Niestandardowy kolor bazy danych</string>
+    <string name="compression">Kompresja</string>
+    <string name="compression_none">Żaden</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Ustawienia klawiatury urządzenia</string>
+    <string name="error_invalid_OTP">Nieprawidłowy klucz tajny OTP.</string>
+    <string name="error_disallow_no_credentials">Należy ustawić co najmniej jedno poświadczenie.</string>
+    <string name="error_otp_secret_key">Klucz tajny musi być w formacie Base32.</string>
+    <string name="error_otp_counter">Licznik musi być między %1$d a %2$d.</string>
+    <string name="error_otp_period">Okres musi wynosić od %1$d do %2$d sekund.</string>
+    <string name="error_otp_digits">Token musi zawierać %1$d do %2$d cyfr.</string>
+    <string name="invalid_db_same_uuid">%1$s o tym samym identyfikatorze UUID %2$s już istnieje.</string>
+    <string name="contains_duplicate_uuid_procedure">Weryfikując to okno dialogowe, KeePass DX rozwiąże problem (poprzez wygenerowanie nowych UUID dla duplikatów) i będzie kontynuował.</string>
+    <string name="clipboard_explanation_summary">Skopiuj pola wprowadzania danych za pomocą schowka urządzenia</string>
+    <string name="advanced_unlock_explanation_summary">Użyj zaawansowanego odblokowywania w celu łatwiejszego otwierania bazy danych</string>
+    <string name="database_data_compression_summary">Kompresja danych zmniejsza rozmiar bazy danych.</string>
+    <string name="max_history_items_title">Maksymalne pozycje historii</string>
+    <string name="max_history_size_summary">Zmień rozmiar historii na wpis (w bajtach binarnych)</string>
+    <string name="settings_database_force_changing_master_key_title">Wymuś zmianę</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Wymuś zmianę następnym razem</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Wymuś zmianę klucza głównego następnym razem (raz)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index bbbc7ff16..45a7812af 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
+--><resources>
     <string name="about_feedback">Comentários</string>
     <string name="about_homepage">Página inicial</string>
     <string name="about_description">KeePass DX é uma implementação para Android do gerenciador de senhas KeePass</string>
@@ -164,7 +163,7 @@
     <string name="error_move_folder_in_itself">Você não pode mover um grupo para dentro de si mesmo.</string>
     <string name="field_name">Nome do campo</string>
     <string name="field_value">Valor do campo</string>
-    <string name="file_not_found_content">Arquivo não encontrado. Tente reabrí-lo de seu provedor de conteúdo.</string>
+    <string name="file_not_found_content">Arquivo não encontrado. Tente reabri-lo de seu provedor de conteúdo.</string>
     <string name="invalid_algorithm">Algoritmo errado.</string>
     <string name="keyfile_does_not_exist">Não existem arquivos-chave.</string>
     <string name="keyfile_is_empty">O arquivo-chave está vazio.</string>
@@ -231,7 +230,7 @@
     <string name="lock_database_screen_off_summary">Bloqueie o banco de dados quando a tela estiver desligada</string>
     <string name="advanced_unlock">Impressão Digital</string>
     <string name="biometric_unlock_enable_title">Escaneamento de impressão digital</string>
-    <string name="biometric_unlock_enable_summary">Permite que você escaneie sua impressão digital para a abertura do banco de dados</string>
+    <string name="biometric_unlock_enable_summary">Permite que você escaneie sua biometria para a abertura do banco de dados</string>
     <string name="biometric_delete_all_key_title">Apague chaves de encriptação</string>
     <string name="biometric_delete_all_key_summary">Apague todas as chaves de encriptação relacionadas ao reconhecimento de Impressões digitais</string>
     <string name="biometric_delete_all_key_warning">Tem certeza que você quer apagar todas as chaves relacionadas ao reconhecimento de Impressões digitais\?</string>
@@ -306,12 +305,15 @@
     <string name="education_donation_title">Participar</string>
     <string name="education_donation_summary">Ajude a aumentar a estabilidade, segurança e na adição de mais recursos.</string>
     <string name="html_text_ad_free">Ao contrário de muitos aplicativos de gerenciamento de senhas, este aplicativo é <strong>livre de anúncios</strong>, <strong>software livre</strong> e não recupera dados pessoais em seus servidores, mesmo em sua versão gratuita.</string>
-    <string name="html_text_buy_pro">Ao comprar a versão pro, você terá acesso a este <strong>recurso visual</strong> e ajudará especialmente a <strong>realização de projetos comunitários.</strong></string>
+    <string name="html_text_buy_pro">Ao comprar a versão pro, você terá acesso a este <strong>recurso visual</strong> e ajudará especialmente a <strong>realização de projetos comunitários.</strong>
+    </string>
     <string name="html_text_feature_generosity">Este <strong>recurso visual</strong> está disponível graças à sua generosidade.</string>
-    <string name="html_text_donation">Para manter a nossa liberdade e estarmos sempre ativos, nós contamos com a sua <strong>contribuição.</strong></string>
+    <string name="html_text_donation">Para manter a nossa liberdade e estarmos sempre ativos, nós contamos com a sua <strong>contribuição.</strong>
+    </string>
     <string name="html_text_dev_feature">Esse recurso está <strong>em desenvolvimento</strong> e exige que sua <strong>contribuição</strong> para que esteja disponível em breve.</string>
     <string name="html_text_dev_feature_buy_pro">Ao comprar a versão <strong>pro</strong>,</string>
-    <string name="html_text_dev_feature_contibute"><strong>Contribuindo </strong>,</string>
+    <string name="html_text_dev_feature_contibute">
+        <strong>Contribuindo </strong>,</string>
     <string name="html_text_dev_feature_encourage">Você está incentivando os desenvolvedores a criar <strong>novos recursos</strong> e a <strong>corrigir erros </strong> de acordo com suas observações.</string>
     <string name="html_text_dev_feature_thanks">Obrigado por sua contribuição.</string>
     <string name="html_text_dev_feature_work_hard">Estamos trabalhando duro para lançar esse recurso o mais rápido possível.</string>
@@ -353,7 +355,7 @@
     <string name="keyboard_key_sound_title">Som ao clicar</string>
     <string name="selection_mode">Modo de seleção</string>
     <string name="do_not_kill_app">Não feche o aplicativo…</string>
-    <string name="lock_database_back_root_title">Pressione Voltar na raiz para trancar</string>
+    <string name="lock_database_back_root_title">Pressione \'Voltar\' para trancar</string>
     <string name="lock_database_back_root_summary">Tranca a base de dados quando o usuário pressiona o botão Voltar na tela inicial</string>
     <string name="clear_clipboard_notification_title">Limpar a área de transferência ao fechar</string>
     <string name="clear_clipboard_notification_summary">Fecha a base de dados ao dispensar a notificação</string>
@@ -396,4 +398,51 @@
     <string name="biometric_auto_open_prompt_summary">Abrir automaticamente o prompt de biometria quando a chave biométrica for definida para o banco de dados</string>
     <string name="enable">Habilitado</string>
     <string name="disable">Desabilitado</string>
+    <string name="master_key">Chave mestre</string>
+    <string name="security">Segurança</string>
+    <string name="entry_history">Histórico</string>
+    <string name="entry_setup_otp">Configurar TOTP</string>
+    <string name="otp_type">Tipo OTP</string>
+    <string name="otp_secret">Segredo</string>
+    <string name="otp_period">Período (segundos)</string>
+    <string name="otp_counter">Contador</string>
+    <string name="otp_digits">Dígitos</string>
+    <string name="otp_algorithm">Algorítimo</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Segredo OTP inválido.</string>
+    <string name="error_disallow_no_credentials">Ao menos uma credencial deve ser definida.</string>
+    <string name="error_copy_group_here">Você não pode copiar um grupo aqui.</string>
+    <string name="error_otp_secret_key">A chave secreta deve estar em formato Base32.</string>
+    <string name="error_otp_counter">O contador deve estar entre %1$d e %2$d.</string>
+    <string name="error_otp_period">O período deve estar entre %1$d e %2$d segundos.</string>
+    <string name="error_otp_digits">O token deve conter de %1$d até %2$d digitos.</string>
+    <string name="invalid_db_same_uuid">%1$s com o mesmo UUID %2$s já existe.</string>
+    <string name="creating_database">Criando banco de dados…</string>
+    <string name="menu_security_settings">Configurações de segurança</string>
+    <string name="menu_master_key_settings">Configurações da chave mestre</string>
+    <string name="contains_duplicate_uuid">O banco de dados contém UUIDs duplicados.</string>
+    <string name="contains_duplicate_uuid_procedure">Ao validar este diálogo, o KeePass DX irá consertar o problema (gerando um novo UUID para os duplicados) e continuar.</string>
+    <string name="database_opened">Banco de dados aberto</string>
+    <string name="clipboard_explanation_summary">Copiar campos de entrada usando a área de transferência do seu aparelho</string>
+    <string name="persistent_notification_title">Notificação persistente</string>
+    <string name="persistent_notification_summary">Adicionar uma notificação quando o banco de dados for aberto</string>
+    <string name="advanced_unlock_explanation_summary">Usar destravamento avançado para abrir o banco de dados mais facilmente</string>
+    <string name="database_data_compression_title">Compressão dos dados</string>
+    <string name="database_data_compression_summary">Compressão dos dados reduz o tamanho do banco de dados.</string>
+    <string name="max_history_items_title">Máx. itens no histórico</string>
+    <string name="max_history_items_summary">Limitar o número de itens do histórico por entrada</string>
+    <string name="max_history_size_title">Máx. tamanho do histórico</string>
+    <string name="max_history_size_summary">Limite de tamanho do histórico por entrada (em bytes binários)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Mudança recomendada</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Recomendar mudança da chave mestre (em dias)</string>
+    <string name="settings_database_force_changing_master_key_title">Forçar mudança</string>
+    <string name="settings_database_force_changing_master_key_summary">Forçar mudança da chave metre (em dias)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Forçar mudança na próxima vez</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Forçar mudança da chave mestre na próxima vez (uma vez)</string>
+    <string name="database_default_username_title">Usuário padrão</string>
+    <string name="database_custom_color_title">Cor personalizada do banco de dados</string>
+    <string name="compression">Compressão</string>
+    <string name="compression_none">Nada</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Configurações do teclado do aparelho</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index d153afd78..07ea2b58b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -87,7 +87,7 @@
     <string name="password">Пароль</string>
     <string name="install_from_play_store">Google Play</string>
     <string name="install_from_f_droid">F-Droid</string>
-    <string name="invalid_credentials">Неверный пароль или файл ключа.</string>
+    <string name="invalid_credentials">Неправильный главный пароль или файл ключа.</string>
     <string name="invalid_algorithm">Неправильный алгоритм.</string>
     <string name="invalid_db_sig">Невозможно определить формат базы.</string>
     <string name="keyfile_does_not_exist">Файл ключа не найден.</string>
@@ -100,7 +100,7 @@
     <string name="maskpass_title">Скрывать пароли</string>
     <string name="maskpass_summary">Скрывать пароли за (***) по умолчанию</string>
     <string name="menu_about">Сведения</string>
-    <string name="menu_change_key_settings">Изменить пароль базы</string>
+    <string name="menu_change_key_settings">Изменить главный пароль</string>
     <string name="settings">Настройки</string>
     <string name="menu_database_settings">Настройки базы</string>
     <string name="menu_delete">Удалить</string>
@@ -151,13 +151,13 @@
     <string name="warning_read_only">Предоставьте доступ к SD-карте на запись для сохранения изменений в базе.</string>
     <string name="warning_unmounted">Подключите SD-карту для создания или загрузки базы.</string>
     <string name="version_label">Версия %1$s</string>
-    <string name="configure_biometric">Отпечатки пальцев поддерживаются, но не настроены.</string>
-    <string name="open_biometric_prompt_unlock_database">Ожидание отпечатка пальца</string>
+    <string name="configure_biometric">Биометрия поддерживается, но не настроена.</string>
+    <string name="open_biometric_prompt_unlock_database">Ожидание биометрического ключа для разблокировки базы</string>
     <string name="encrypted_value_stored">Зашифрованный пароль сохранён</string>
-    <string name="biometric_invalid_key">Неправильный отпечаток пальца. Восстановите пароль.</string>
-    <string name="biometric_scanning_error">Проблема с отпечатком пальца: %1$s</string>
-    <string name="open_biometric_prompt_store_credential">Используйте отпечаток пальца, чтобы сохранить пароль</string>
-    <string name="no_credentials_stored">Для этой базы пароль ещё не сохранён.</string>
+    <string name="biometric_invalid_key">Неправильный биометрический ключ. Восстановите главный пароль.</string>
+    <string name="biometric_scanning_error">Проблема с биометрическим ключом: %1$s</string>
+    <string name="open_biometric_prompt_store_credential">Используйте биометрический ключ, чтобы сохранить главный пароль</string>
+    <string name="no_credentials_stored">Для этой базы главный пароль ещё не сохранён.</string>
     <string name="education_unlock_summary">Введите пароль и/или файл ключа, чтобы разблокировать базу.
 \n
 \nНе забывайте сохранять копию файла базы в безопасном месте после каждого изменения.</string>
@@ -184,7 +184,7 @@
     <string name="copy_field">%1$s скопировано</string>
     <string name="menu_form_filling_settings">Заполнение форм</string>
     <string name="encryption_explanation">Алгоритм шифрования базы для всех данных.</string>
-    <string name="kdf_explanation">При создании ключа для алгоритма шифрования, пароль базы преобразуется при помощи функции формирования ключа со случайной солью.</string>
+    <string name="kdf_explanation">При создании ключа для алгоритма шифрования, главный пароль преобразуется при помощи функции формирования ключа со случайной солью.</string>
     <string name="memory_usage">Использование памяти</string>
     <string name="memory_usage_explanation">Объём памяти (в байтах), которое будет использоваться функцией формирования ключа.</string>
     <string name="parallelism">Уровень параллелизма</string>
@@ -207,7 +207,7 @@
     <string name="menu_move">Переместить</string>
     <string name="menu_paste">Вставить</string>
     <string name="menu_cancel">Отмена</string>
-    <string name="menu_biometric_remove_key">Удалить отпечаток</string>
+    <string name="menu_biometric_remove_key">Удалить биометрический ключ</string>
     <string name="menu_file_selection_read_only">Только чтение</string>
     <string name="menu_open_file_read_and_write">Чтение и запись</string>
     <string name="sort_groups_before">Сначала группы</string>
@@ -215,7 +215,7 @@
     <string name="sort_title">Название записи</string>
     <string name="warning_empty_password">Вы действительно не хотите использовать пароль для защиты базы\?</string>
     <string name="warning_no_encryption_key">Вы действительно не хотите использовать ключ шифрования?</string>
-    <string name="biometric_not_recognized">Отпечаток пальца не распознан</string>
+    <string name="biometric_not_recognized">Биометрический ключ не распознан</string>
     <string name="database_history">История</string>
     <string name="menu_appearance_settings">Внешний вид</string>
     <string name="general">Общие</string>
@@ -236,17 +236,17 @@
     <string name="lock_database_screen_off_title">Блокировка экрана</string>
     <string name="lock_database_screen_off_summary">Блокировать базу при отключении экрана</string>
     <string name="advanced_unlock">Отпечаток пальца</string>
-    <string name="biometric_unlock_enable_title">Сканирование отпечатка пальца</string>
-    <string name="biometric_unlock_enable_summary">Включить разблокировку базы с помощью отпечатка пальца</string>
+    <string name="biometric_unlock_enable_title">Сканирование биометрического ключа</string>
+    <string name="biometric_unlock_enable_summary">Включить разблокировку базы при помощи биометрического ключа</string>
     <string name="biometric_delete_all_key_title">Удалить ключи шифрования</string>
-    <string name="biometric_delete_all_key_summary">Удалить все ключи шифрования, связанные с распознаванием отпечатка пальца</string>
-    <string name="biometric_delete_all_key_warning">Вы уверены, что хотите удалить все ключи, связанные с отпечатком пальца?</string>
+    <string name="biometric_delete_all_key_summary">Удалить все ключи шифрования, связанные с распознаванием биометрического ключа</string>
+    <string name="biometric_delete_all_key_warning">Вы уверены, что хотите удалить все ключи, связанные с биометрическим ключом\?</string>
     <string name="unavailable_feature_text">Невозможно запустить эту функцию.</string>
     <string name="unavailable_feature_version">Ваша версия Android %1$s ниже минимально необходимой %2$s.</string>
     <string name="unavailable_feature_hardware">Соответствующее оборудование не найдено.</string>
     <string name="file_name">Имя файла</string>
     <string name="path">Путь</string>
-    <string name="assign_master_key">Установить пароль базы</string>
+    <string name="assign_master_key">Установить главный пароль</string>
     <string name="create_keepass_file">Создать новую базу</string>
     <string name="bytes">Байт</string>
     <string name="full_file_path_enable_title">Путь к файлу</string>
@@ -267,8 +267,8 @@
     <string name="keyboard">Клавиатура</string>
     <string name="magic_keyboard_title">Magikeyboard</string>
     <string name="magic_keyboard_explanation_summary">Активировать пользовательскую клавиатуру для простого заполнения паролей и всех ваших идентификаторов</string>
-    <string name="allow_no_password_title">Разрешить без пароля</string>
-    <string name="allow_no_password_summary">Включить кнопку \"Открыть\", если пароль не указан</string>
+    <string name="allow_no_password_title">Разрешить без главного пароля</string>
+    <string name="allow_no_password_summary">Включить кнопку \"Открыть\", если главный пароль не указан</string>
     <string name="enable_read_only_title">Только чтение</string>
     <string name="enable_read_only_summary">По умолчанию открывать базу только для чтения</string>
     <string name="enable_education_screens_title">Экраны обучения</string>
@@ -285,13 +285,13 @@
 \n
 \nДобавляйте группы (аналог папок) для организации записей и баз.</string>
     <string name="education_search_title">Легко находите ваши записи</string>
-    <string name="education_biometric_title">Разблокируйте базу с помощью отпечатка пальца</string>
-    <string name="education_biometric_summary">Установите связь между паролем и отпечатком пальца для быстрой разблокировки базы.</string>
+    <string name="education_biometric_title">Разблокируйте базу с помощью биометрического ключа</string>
+    <string name="education_biometric_summary">Установите взаимосвязь между паролем и биометрическим ключом для быстрой разблокировки базы.</string>
     <string name="education_search_summary">Ищите записи по названию, имени или другим полям для быстрого доступа к своим паролям.</string>
     <string name="education_entry_edit_title">Редактируйте записи</string>
     <string name="education_entry_edit_summary">Редактируйте записи с настраиваемыми полями. Возможны перекрёстные ссылки между полями разных записей.</string>
     <string name="education_generate_password_title">Создайте надёжный пароль для записи.</string>
-    <string name="education_generate_password_summary">Создайте надёжный пароль, связанный с записью, легко настраиваемый под критерии формы. И не забудьте пароль от базы.</string>
+    <string name="education_generate_password_summary">Создайте надёжный пароль, связанный с записью, легко настраиваемый под критерии формы. И не забудьте главный пароль от базы.</string>
     <string name="education_entry_new_field_title">Добавляйте настраиваемые поля</string>
     <string name="education_entry_new_field_summary">Зарегистрируйте дополнительное поле, просто заполнив его, добавьте значение и при необходимости защитите.</string>
     <string name="education_unlock_title">Разблокируйте базу</string>
@@ -311,15 +311,12 @@
     <string name="education_donation_title">Участвуйте</string>
     <string name="education_donation_summary">Примите участие в проекте для повышения стабильности, безопасности и добавления новых возможностей.</string>
     <string name="html_text_ad_free">В отличие от многих приложений управления паролями, это <strong>без рекламы</strong>, <strong>свободное программное обеспечение (copyleft)</strong> и не хранит ваши личные данные на своих серверах независимо от того, какую версию вы используете.</string>
-    <string name="html_text_buy_pro">При покупке Pro-версии вы будете иметь доступ к этим <strong>визуальным функциям</strong> и особенно поможете <strong>реализации общественных проектов.</strong>
-    </string>
+    <string name="html_text_buy_pro">При покупке Pro-версии вы будете иметь доступ к этим <strong>визуальным функциям</strong> и особенно поможете <strong>реализации общественных проектов.</strong></string>
     <string name="html_text_feature_generosity">Эти <strong>визуальные функции</strong> доступны благодаря вашей щедрости.</string>
-    <string name="html_text_donation">Для того, чтобы сохранить нашу независимость и быть всегда активными, мы рассчитываем на ваш <strong>вклад.</strong>
-    </string>
+    <string name="html_text_donation">Для того, чтобы сохранить нашу независимость и быть всегда активными, мы рассчитываем на ваш <strong>вклад.</strong></string>
     <string name="html_text_dev_feature">Эта функция находится <strong>в разработке</strong> и требует вашего <strong>участия</strong>, чтобы стать доступной в ближайшее время.</string>
     <string name="html_text_dev_feature_buy_pro">Покупая <strong>Pro</strong>-версию,</string>
-    <string name="html_text_dev_feature_contibute">
-        <strong>Участвуя в проекте</strong>,</string>
+    <string name="html_text_dev_feature_contibute"><strong>Участвуя в проекте</strong>,</string>
     <string name="html_text_dev_feature_encourage">вы поощряете разработчиков добавлять <strong>новые возможности</strong> и <strong>исправлять ошибки</strong> в соответствии с вашими замечаниями.</string>
     <string name="html_text_dev_feature_thanks">Спасибо большое за ваш вклад.</string>
     <string name="html_text_dev_feature_work_hard">Мы прилагаем все усилия, чтобы быстро выпустить эту функцию.</string>
@@ -353,7 +350,7 @@
     <string name="keyboard_key_vibrate_title">Вибрация при нажатии</string>
     <string name="keyboard_key_sound_title">Звук при нажатии</string>
     <string name="do_not_kill_app">Не убивать приложение…</string>
-    <string name="lock_database_back_root_title">\"Назад\" для блокировки</string>
+    <string name="lock_database_back_root_title">Нажмите \"Назад\" для блокировки</string>
     <string name="lock_database_back_root_summary">Блокировка базы при нажатии кнопки \"Назад\" на начальном экране</string>
     <string name="clear_clipboard_notification_title">Очищать при закрытии</string>
     <string name="clear_clipboard_notification_summary">Закрывать базу при закрытии уведомления</string>
@@ -387,14 +384,61 @@
     <string name="content_description_keyboard_close_fields">Закрыть поля</string>
     <string name="error_create_database_file">Невозможно создать базу с этим паролем и ключевым файлом.</string>
     <string name="menu_advanced_unlock_settings">Дополнительная разблокировка</string>
-    <string name="biometric_prompt_store_credential_title">Сохранение отпечатка пальца</string>
-    <string name="biometric_prompt_store_credential_message">Сохранять пароль базы отпечатком пальца</string>
-    <string name="biometric_prompt_extract_credential_title">Открывать базу отпечатком пальца</string>
-    <string name="biometric_prompt_extract_credential_message">Извлекать пароль отпечатком пальца</string>
-    <string name="biometric">Отпечаток пальца</string>
-    <string name="biometric_auto_open_prompt_title">Автозапрос отпечатка пальца</string>
-    <string name="biometric_auto_open_prompt_summary">Автоматически открывать запрос отпечатка пальца, если отпечаток установлен для базы</string>
+    <string name="biometric_prompt_store_credential_title">Сохранение биометрического ключа</string>
+    <string name="biometric_prompt_store_credential_message">Сохранять главный пароль биометрическим ключом</string>
+    <string name="biometric_prompt_extract_credential_title">Открывать базу биометрическим ключом</string>
+    <string name="biometric_prompt_extract_credential_message">Извлекать главный пароль биометрическим ключом</string>
+    <string name="biometric">Биометрический ключ</string>
+    <string name="biometric_auto_open_prompt_title">Автозапрос биометрического ключа</string>
+    <string name="biometric_auto_open_prompt_summary">Автоматически открывать запрос биометрического ключа, если он установлен для базы</string>
     <string name="enable">Включить</string>
     <string name="disable">Отключить</string>
     <string name="selection_mode">Режим выбора</string>
+    <string name="master_key">Главный пароль</string>
+    <string name="security">Безопасность</string>
+    <string name="entry_history">История</string>
+    <string name="entry_setup_otp">Настройка одноразового пароля</string>
+    <string name="otp_type">Тип одноразового пароля</string>
+    <string name="otp_secret">Секретный ключ</string>
+    <string name="otp_period">Время (в секундах)</string>
+    <string name="otp_counter">Счётчик</string>
+    <string name="otp_digits">Цифры</string>
+    <string name="otp_algorithm">Алгоритм</string>
+    <string name="entry_otp">Одноразовый пароль</string>
+    <string name="error_invalid_OTP">Недействительный секретный ключ одноразового пароля.</string>
+    <string name="error_disallow_no_credentials">Должен быть установлен, по крайней мере, один пароль.</string>
+    <string name="error_copy_group_here">Вы не можете копировать группу сюда.</string>
+    <string name="error_otp_secret_key">Секретный ключ должен быть в формате BASE32.</string>
+    <string name="error_otp_counter">Счётчик должен быть в диапазоне между %1$d и %2$d.</string>
+    <string name="error_otp_period">Время должно быть в диапазоне между %1$d и %2$d сек.</string>
+    <string name="error_otp_digits">Токен должен содержать от %1$d до %2$d цифр.</string>
+    <string name="invalid_db_same_uuid">%1$s с таким же UUID %2$s уже существует.</string>
+    <string name="creating_database">Создание базы…</string>
+    <string name="menu_security_settings">Настройки безопасности</string>
+    <string name="menu_master_key_settings">Настройки главного пароля</string>
+    <string name="contains_duplicate_uuid">База содержит повторяющиеся UUID.</string>
+    <string name="contains_duplicate_uuid_procedure">Если вы разрешите, KeePass DX исправит проблему (путём создания новых UUID для дубликатов) и продолжит работу.</string>
+    <string name="database_opened">База открыта</string>
+    <string name="clipboard_explanation_summary">Копирование полей ввода с помощью буфера обмена устройства</string>
+    <string name="persistent_notification_title">Постоянное уведомление</string>
+    <string name="persistent_notification_summary">Показывать уведомление, пока открыта база</string>
+    <string name="advanced_unlock_explanation_summary">Использовать дополнительную разблокировку для более лёгкого открытия базы данных</string>
+    <string name="database_data_compression_title">Сжатие данных</string>
+    <string name="database_data_compression_summary">Сжатие данных уменьшает размер базы</string>
+    <string name="max_history_items_title">Максимум записей в истории</string>
+    <string name="max_history_items_summary">Ограничение числа элементов истории каждой записи</string>
+    <string name="max_history_size_title">Максимальный размер истории</string>
+    <string name="max_history_size_summary">Ограничение размера истории каждой записи (в байтах)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Рекомендуемая смена</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Рекомендовать менять главный пароль (в днях)</string>
+    <string name="settings_database_force_changing_master_key_title">Принудительная смена</string>
+    <string name="settings_database_force_changing_master_key_summary">Принудительно менять главный пароль (в днях)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Принудительная смена в следующий раз</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Принудительная смена главного пароля при следующем запуске (один раз)</string>
+    <string name="database_default_username_title">Имя по умолчанию</string>
+    <string name="database_custom_color_title">Произвольный цвет базы</string>
+    <string name="compression">Сжатие</string>
+    <string name="compression_none">Нет</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Настройки клавиатуры устройства</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 12edf7f84..5cf59ea62 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -19,31 +19,31 @@
   
   Swedish translation by Niclas Burgren (burgren@gmail.com)
 --><resources>
-    <string name="about_feedback">Feedback:</string>
-    <string name="about_homepage">Hemsida:</string>
-    <string name="about_description">KeePass DX är en Android-implementation av KeePass password manager.</string>
+    <string name="about_feedback">Feedback</string>
+    <string name="about_homepage">Hemsida</string>
+    <string name="about_description">Android-implementation av KeePass password manager</string>
     <string name="accept">OK</string>
     <string name="add_entry">Ny post</string>
     <string name="add_group">Ny grupp</string>
     <string name="encryption_algorithm">Krypterings algoritm</string>
-    <string name="app_timeout">Tidsgräns för applikation</string>
-    <string name="app_timeout_summary">Tid innan låsning när applikationen är inaktiv.</string>
-    <string name="application">Applikation</string>
+    <string name="app_timeout">Tidsgräns för app</string>
+    <string name="app_timeout_summary">Inaktivitet innan appen låses</string>
+    <string name="application">App</string>
     <string name="menu_app_settings">Inställningar för applikation</string>
     <string name="beta_dontask">Visa inte igen</string>
     <string name="brackets">Parenteser</string>
-    <string name="file_manager_install_description">Filhantering kräver Open Intents File Manager, klicka nedan för att installera. Filhanteraren kanske inte fungerar korrekt vid första användningen.</string>
-    <string name="clipboard_cleared">Urklippet är rensat.</string>
+    <string name="file_manager_install_description">Skapa, öppna och spara en databasfil kräver att du installerar en filhanterare som accepterar avsiktlig åtgärd ACTION_CREATE_DOCUMENT och ACTION_OPEN_DOCUMENT</string>
+    <string name="clipboard_cleared">Urklipp har rensats</string>
     <string name="clipboard_error_title">Urklippsfel</string>
-    <string name="clipboard_error">Vissa Samsung-telefoner har en bugg som gör att applikationer inte kan kopiera till urklipp. För mer detaljer, gå till:</string>
-    <string name="clipboard_error_clear">Urklippet kunde inte rensas</string>
+    <string name="clipboard_error">Vissa Samsung Android-telefoner låter inte appar använda Urklipp.</string>
+    <string name="clipboard_error_clear">Det gick inte att rensa urklipp</string>
     <string name="clipboard_timeout">Tidsgräns för urklipp</string>
-    <string name="clipboard_timeout_summary">Tiden innan användarnamn och lösenord rensas från urklipp</string>
+    <string name="clipboard_timeout_summary">Lagringens varaktighet i urklippet</string>
     <string name="select_to_copy">Kopiera %1$s till urklipp</string>
     <string name="retrieving_db_key">Skapar databasnyckel…</string>
     <string name="database">Databas</string>
     <string name="decrypting_db">Dekrypterar databasinnehåll…</string>
-    <string name="default_checkbox">Använda denna databasen som standard</string>
+    <string name="default_checkbox">Använd som standarddatabas</string>
     <string name="digits">Siffror</string>
     <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft kommer HELT UTAN GARANTIER; Detta är fri programvara och du är välkommen att distribuera den utifrån villkoren i GPL version 3 eller senare.</string>
     <string name="select_database_file">Ange databasnamn</string>
@@ -160,6 +160,29 @@
         <item>Medium</item>
         <item>Stor</item>
     </string-array>
-    <string name="edit_entry">Uppdatera post</string>
+    <string name="edit_entry">Redigera post</string>
     <string name="encryption">Kryptering</string>
-</resources>
+    <string name="key_derivation_function">Nyckelhärledningsfunktion</string>
+    <string name="extended_ASCII">Utökad ASCII</string>
+    <string name="allow">Tillåt</string>
+    <string name="clipboard_swipe_clean">Svep för att rensa urklipp nu</string>
+    <string name="content_description_open_file">Öppna fil</string>
+    <string name="content_description_add_node">Lägg till nod</string>
+    <string name="content_description_add_entry">Lägg till post</string>
+    <string name="content_description_add_group">Lägg till grupp</string>
+    <string name="content_description_file_information">Filinformation</string>
+    <string name="content_description_password_checkbox">Lösenord kryssruta</string>
+    <string name="content_description_keyfile_checkbox">Nyckelfil kryssruta</string>
+    <string name="content_description_repeat_toggle_password_visibility">Repetera växla lösenordssynlighet</string>
+    <string name="content_description_entry_icon">Post ikon</string>
+    <string name="content_description_entry_save">Post spara</string>
+    <string name="content_description_password_generator">Lösenordsgenerator</string>
+    <string name="content_description_password_length">Lösenords längd</string>
+    <string name="content_description_add_field">Lägg till fält</string>
+    <string name="content_description_remove_field">Ta bort fält</string>
+    <string name="content_description_background">Bakgrund</string>
+    <string name="content_description_update_from_list">Uppdatera</string>
+    <string name="content_description_keyboard_close_fields">Stäng fält</string>
+    <string name="master_key">Huvudnyckel</string>
+    <string name="security">Säkerhet</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 61267754e..5d947edea 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
+--><resources>
     <string name="about_feedback">Geri Bildirim</string>
     <string name="about_homepage">Ana sayfa</string>
     <string name="about_description">KeePass parola yöneticisinin Android uygulaması</string>
@@ -220,7 +219,7 @@
     <string name="lock_database_screen_off_summary">Ekran kapalıyken veritabanını kilitle</string>
     <string name="advanced_unlock">Parmakizi</string>
     <string name="biometric_unlock_enable_title">Parmak izi tarama</string>
-    <string name="biometric_unlock_enable_summary">Veritabanını açmak için parmak izinizi taramanızı sağlar</string>
+    <string name="biometric_unlock_enable_summary">Veritabanını açmak için biyometriklerinizi taramanızı sağlar</string>
     <string name="biometric_delete_all_key_title">Şifreleme anahtarlarını silin</string>
     <string name="biometric_delete_all_key_summary">Parmak izi tanıma ile ilgili tüm şifreleme anahtarlarını silin</string>
     <string name="biometric_delete_all_key_warning">Parmak izi tanıma ile ilgili tüm tuşları silmek istediğinizden emin misiniz\?</string>
@@ -319,9 +318,9 @@
     <string name="html_text_donation">Özgürlüğümüzü korumak ve daima aktif olmak için <strong>katkılarınıza</strong> güveniyoruz</string>
     <string name="html_text_dev_feature">Bu özellik <strong>geliştirme aşamasındadır</strong> ve <strong>katkılarınızın</strong> yakında kullanıma sunulmasını gerektirir.</string>
     <string name="html_text_dev_feature_buy_pro">
-        <strong>pro</strong> sürümü satın alarak,</string>
+        <strong>Pro</strong> sürümü satın alarak,</string>
     <string name="html_text_dev_feature_contibute">
-        <strong>katkıda</strong> bulunarak,</string>
+        <strong>Katkıda</strong> bulunarak,</string>
     <string name="html_text_dev_feature_encourage">Geliştiricilerin <strong>yeni özellikler</strong> oluşturmasını ve söz konusu hatalara göre <strong>hataları düzeltmesini</strong> teşvik ediyorsunuz.</string>
     <string name="html_text_dev_feature_thanks">Katkınız için çok teşekkür ederim.</string>
     <string name="html_text_dev_feature_work_hard">Bu özelliği çabucak yayınlamak için çok çalışıyoruz.</string>
@@ -359,7 +358,7 @@
     <string name="error_copy_entry_here">Buraya bir girişi kopyalayamazsınız.</string>
     <string name="list_groups_show_number_entries_title">Giriş sayısını göster</string>
     <string name="list_groups_show_number_entries_summary">Bir gruptaki girişlerin sayısını göster</string>
-    <string name="lock_database_back_root_title">Kilitlemek için Root\'a Geri basın</string>
+    <string name="lock_database_back_root_title">Kilitlemek için \'Geri\'ye basın</string>
     <string name="recycle_bin">Geri Dönüşüm Kutusu</string>
     <string name="keyboard_selection_entry_title">Giriş seçimi</string>
     <string name="keyboard_selection_entry_summary">Bir girişi görüntülerken Magikeyboard\'da giriş alanlarını göster</string>
@@ -382,4 +381,51 @@
     <string name="biometric_auto_open_prompt_summary">Bir veritabanı için bir biyometrik anahtar tanımlandığında biyometrik komut istemini otomatik olarak aç</string>
     <string name="enable">Etkinleştir</string>
     <string name="disable">Devre dışı</string>
+    <string name="master_key">Ana Anahtar</string>
+    <string name="security">Güvenlik</string>
+    <string name="entry_history">Geçmiş</string>
+    <string name="entry_setup_otp">Tek Seferlik Parola Ayarla</string>
+    <string name="otp_type">OTP türü</string>
+    <string name="otp_secret">Sır</string>
+    <string name="otp_period">Periyot (saniye)</string>
+    <string name="otp_counter">Sayaç</string>
+    <string name="otp_digits">Basamak</string>
+    <string name="otp_algorithm">Algoritma</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">Geçersiz OTP sırrı.</string>
+    <string name="error_disallow_no_credentials">En azından bir kimlik bilgisi ayarlanmalıdır.</string>
+    <string name="error_copy_group_here">Bir grubu buraya kopyalayamazsınız.</string>
+    <string name="error_otp_secret_key">Gizli anahtar Base32 formatında olmalıdır.</string>
+    <string name="error_otp_counter">Sayaç %1$d ile %2$d arasında olmalıdır.</string>
+    <string name="error_otp_period">Periyot %1$d ile %2$d saniye arasında olmalıdır.</string>
+    <string name="error_otp_digits">Belirteç %1$d ile %2$d basamak içermelidir.</string>
+    <string name="invalid_db_same_uuid">%1$s aynı UUID değerine sahip %2$s zaten var.</string>
+    <string name="creating_database">Veritabanı oluşturuluyor…</string>
+    <string name="menu_security_settings">Güvenlik ayarları</string>
+    <string name="menu_master_key_settings">Ana Anahtar ayarları</string>
+    <string name="contains_duplicate_uuid">Veritabanı tekrarlanan UUID\'ler içermektedir.</string>
+    <string name="contains_duplicate_uuid_procedure">Bu iletişim kutusunu doğrulayarak, KeePass DX sorunu çözecek (tekrarlananlar için yeni UUID\'ler oluşturarak) ve devam edecektir.</string>
+    <string name="database_opened">Veritabanı açıldı</string>
+    <string name="clipboard_explanation_summary">Cihazınızın panosunu kullanarak giriş alanlarını kopyala</string>
+    <string name="persistent_notification_title">Kalıcı bildirim</string>
+    <string name="persistent_notification_summary">Veritabanı açıkken bir bildirim ekle</string>
+    <string name="advanced_unlock_explanation_summary">Veritabanını daha kolay açmak için gelişmiş kilit açma özelliğini kullan</string>
+    <string name="database_data_compression_title">Veri sıkıştırma</string>
+    <string name="database_data_compression_summary">Veri sıkıştırma veritabanı boyutunu azaltır.</string>
+    <string name="max_history_items_title">Maks. geçmiş ögeleri</string>
+    <string name="max_history_items_summary">Giriş başına geçmiş öge sayısını sınırla</string>
+    <string name="max_history_size_title">Maks. geçmiş boyutu</string>
+    <string name="max_history_size_summary">Giriş başına geçmiş boyutunu sınırla (ikili bayt olarak)</string>
+    <string name="settings_database_recommend_changing_master_key_title">Değiştirmeyi öner</string>
+    <string name="settings_database_recommend_changing_master_key_summary">Ana anahtarın değiştirilmesini öner (gün)</string>
+    <string name="settings_database_force_changing_master_key_title">Değiştirmeyi zorla</string>
+    <string name="settings_database_force_changing_master_key_summary">Ana anahtarı değiştirmeye zorla (gün)</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">Bir dahaki sefere değiştirmeye zorla</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">Bir dahaki sefere ana anahtarı değiştirmeye zorla (bir kez)</string>
+    <string name="database_default_username_title">Varsayılan kullanıcı adı</string>
+    <string name="database_custom_color_title">Özel veritabanı rengi</string>
+    <string name="compression">Sıkıştırma</string>
+    <string name="compression_none">Yok</string>
+    <string name="compression_gzip">GZip</string>
+    <string name="device_keyboard_setting_title">Cihaz Klavye Ayarları</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 05347382d..a0fe97fce 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources>
+--><resources>
     <string name="about_feedback">反馈</string>
     <string name="about_homepage">主页</string>
     <string name="about_description">Android平台上的KeePass密码管理器</string>
@@ -179,7 +178,7 @@
     <string name="menu_paste">粘贴</string>
     <string name="menu_cancel">取消</string>
     <string name="menu_showpass">显示密码</string>
-    <string name="menu_biometric_remove_key">删除保存的指纹</string>
+    <string name="menu_biometric_remove_key">删除保存的生物识别密钥</string>
     <string name="menu_file_selection_read_only">只读</string>
     <string name="menu_open_file_read_and_write">可修改</string>
     <string name="omitbackup_title">搜索时忽略备份条目</string>
@@ -205,7 +204,7 @@
     <string name="search_results">搜索结果</string>
     <string name="warning">警告</string>
     <string name="version_label">版本 %1$s</string>
-    <string name="open_biometric_prompt_store_credential">使用指纹保存此密码</string>
+    <string name="open_biometric_prompt_store_credential">使用生物识别保存此密码</string>
     <string name="database_history">历史</string>
     <string name="menu_appearance_settings">外观</string>
     <string name="general">一般设置</string>
@@ -215,7 +214,7 @@
     <string name="clipboard">剪贴板</string>
     <string name="clipboard_notifications_title">剪贴板通知</string>
     <string name="lock">锁定</string>
-    <string name="advanced_unlock">指纹</string>
+    <string name="advanced_unlock">高级解锁</string>
     <string name="file_name">文件名</string>
     <string name="path">路径</string>
     <string name="create_keepass_file">创建新数据库</string>
@@ -246,12 +245,12 @@
     <string name="warning_empty_password">确定不用密码解锁保护？</string>
     <string name="warning_no_encryption_key">确认使用空密钥吗？</string>
     <string name="build_label">版本 %1$s</string>
-    <string name="configure_biometric">支持但未配置指纹解锁。</string>
-    <string name="open_biometric_prompt_unlock_database">指纹扫描</string>
+    <string name="configure_biometric">支持但未配置生物识别。</string>
+    <string name="open_biometric_prompt_unlock_database">打开生物识别提示以解锁数据库</string>
     <string name="encrypted_value_stored">加密密码已保存</string>
-    <string name="biometric_invalid_key">不能读取指纹密码，请恢复你的密码。</string>
-    <string name="biometric_not_recognized">无法识别指纹</string>
-    <string name="biometric_scanning_error">指纹识别问题：%1$s</string>
+    <string name="biometric_invalid_key">不能读取生物识别密钥，还原你的凭据。</string>
+    <string name="biometric_not_recognized">无法识别生物识别信息</string>
+    <string name="biometric_scanning_error">生物识别错误：%1$s</string>
     <string name="no_credentials_stored">当前数据库无密码。</string>
     <string name="set_autofill_service_title">设为默认填充服务</string>
     <string name="autofill_explanation_summary">启用自动填充功能，以便捷地在其他应用中填写信息</string>
@@ -263,11 +262,11 @@
     <string name="clipboard_warning">如自动清空剪切板失败，则请手动清空。</string>
     <string name="lock_database_screen_off_title">锁定屏幕</string>
     <string name="lock_database_screen_off_summary">当屏幕熄灭时锁定数据库</string>
-    <string name="biometric_unlock_enable_title">指纹扫描</string>
-    <string name="biometric_unlock_enable_summary">通过扫描指纹解锁数据库</string>
+    <string name="biometric_unlock_enable_title">生物识别解锁</string>
+    <string name="biometric_unlock_enable_summary">通过生物识别解锁数据库</string>
     <string name="biometric_delete_all_key_title">删除加密密钥</string>
-    <string name="biometric_delete_all_key_summary">删除所有与指纹相关的加密密钥</string>
-    <string name="biometric_delete_all_key_warning">要删除所有指纹密钥吗？</string>
+    <string name="biometric_delete_all_key_summary">删除所有与生物相关的加密密钥</string>
+    <string name="biometric_delete_all_key_warning">要删除所有生物识别密钥吗？</string>
     <string name="unavailable_feature_text">无法启动此功能。</string>
     <string name="unavailable_feature_version">你的Android版本 %1$s 无法满足软件对系统版本 %2$s 的要求。</string>
     <string name="unavailable_feature_hardware">找不到所需的硬件。</string>
@@ -279,7 +278,7 @@
     <string name="allow_copy_password_summary">让剪切板保存条目密码及保密字段</string>
     <string name="allow_copy_password_warning">警告：复制密码时密码在剪贴板中，而所有应用都可访问剪切板。因此复制密码时，您设备上的其他应用也能看到密码。</string>
     <string name="magic_keyboard_explanation_summary">激活自定义键盘以填写密码和所有身份字段</string>
-    <string name="allow_copy_password_title">对剪贴板的信任</string>
+    <string name="allow_copy_password_title">信任剪贴板</string>
     <string name="keyboard_name">输入密码专用键盘</string>
     <string name="keyboard_label">输入密码专用键盘（KeePass DX）</string>
     <string name="keyboard_setting_label">输入密码专用键盘设置</string>
@@ -298,7 +297,7 @@
     <string name="keyboard_keys_category">按键</string>
     <string name="keyboard_key_vibrate_title">点击按键时震动</string>
     <string name="keyboard_key_sound_title">点击按键时的声音</string>
-    <string name="allow_no_password_title">允许空主密码</string>
+    <string name="allow_no_password_title">允许主密钥为空</string>
     <string name="allow_no_password_summary">未选择验证方式也启用“打开”按钮</string>
     <string name="enable_education_screens_title">新手引导</string>
     <string name="enable_education_screens_summary">突出界面元素来学习如何使用本应用</string>
@@ -315,8 +314,8 @@
 \n您还可以使用群组来管理数据库中的条目。</string>
     <string name="education_search_title">搜索条目</string>
     <string name="education_search_summary">输入标题、用户名或其他字段的内容来搜索密码。</string>
-    <string name="education_biometric_title">通过指纹解锁数据库</string>
-    <string name="education_biometric_summary">将主密码与指纹关联，以快速解锁数据库。</string>
+    <string name="education_biometric_title">通过生物识别解锁数据库</string>
+    <string name="education_biometric_summary">将主密钥与生物识别信息关联，以快速解锁数据库。</string>
     <string name="education_entry_edit_title">编辑此条目</string>
     <string name="education_entry_edit_summary">使用自定义字段编辑条。自定义字段可以在不同的条目间引用。</string>
     <string name="education_generate_password_title">为您的记录创建一个强密码。</string>
@@ -342,7 +341,7 @@
     <string name="html_text_ad_free">不同于大多数的密码管理软件，不论您使用哪个版本的KeePass DX，都没有<strong>广告</strong>，并且<strong>免费开源</strong>，也不收集任何用户的个人信息。</string>
     <string name="html_text_buy_pro">通过购买高级版本，您将解锁全部<strong>主题样式</strong>，重要的是，您会为<strong>社区项目的实现</strong>提供的帮助</string>
     <string name="html_text_feature_generosity">此<strong>主题样式</strong>现在已经可用，感谢您的慷慨相助。</string>
-    <string name="html_text_donation">为继续建设此免费项目，我们需要您的<strong>捐助。</strong>
+    <string name="html_text_donation">为继续建设此自由项目，我们需要您的<strong>捐助。</strong>
     </string>
     <string name="html_text_dev_feature">这个特性目前<strong>仍在开发中</strong>，您的<strong>捐助</strong>将使这个特性在未来变得可用。</string>
     <string name="html_text_dev_feature_buy_pro">通过购买<strong>专业</strong>版，</string>
@@ -353,7 +352,7 @@
     <string name="html_text_dev_feature_upgrade">别忘了更新应用。</string>
     <string name="selection_mode">选择模式</string>
     <string name="do_not_kill_app">不要终止应用程序…</string>
-    <string name="lock_database_back_root_title">在根目录返回以锁定</string>
+    <string name="lock_database_back_root_title">按返回键以锁定</string>
     <string name="lock_database_back_root_summary">在点按根屏幕上的后退按钮时锁定数据库</string>
     <string name="clear_clipboard_notification_title">关闭应用时清空剪贴板</string>
     <string name="clear_clipboard_notification_summary">关闭通知时关闭数据库</string>
@@ -396,4 +395,51 @@
     <string name="biometric_auto_open_prompt_summary">生物识别密钥已配置时自动打开提示</string>
     <string name="enable">启用</string>
     <string name="disable">禁用</string>
+    <string name="master_key">主密钥</string>
+    <string name="security">安全</string>
+    <string name="entry_history">历史</string>
+    <string name="entry_setup_otp">设置一次性密码</string>
+    <string name="otp_type">一次性密码类型</string>
+    <string name="otp_secret">密钥</string>
+    <string name="otp_period">时长（秒）</string>
+    <string name="otp_counter">计数器</string>
+    <string name="otp_digits">数字位数</string>
+    <string name="otp_algorithm">算法</string>
+    <string name="entry_otp">一次性密码</string>
+    <string name="error_invalid_OTP">一次性密码密钥错误。</string>
+    <string name="error_disallow_no_credentials">至少需要设置一个凭据。</string>
+    <string name="error_copy_group_here">不能将群组复制到这里。</string>
+    <string name="error_otp_secret_key">密钥必须是BASE32格式。</string>
+    <string name="error_otp_counter">计数器必须在%1$d和%2$d之间。</string>
+    <string name="error_otp_period">时长必须在%1$d秒到%2$d秒之间。</string>
+    <string name="error_otp_digits">令牌必须包括%1$d到%2$d个数字。</string>
+    <string name="invalid_db_same_uuid">与%1$s的UUID相同的%2$s已经存在。</string>
+    <string name="creating_database">创建数据库…</string>
+    <string name="menu_security_settings">安全设置</string>
+    <string name="menu_master_key_settings">主密钥设置</string>
+    <string name="contains_duplicate_uuid">数据库包含了重复的UUID。</string>
+    <string name="contains_duplicate_uuid_procedure">通过验证此对话框，KeePass DX将解决这个问题（通过给重复项生成新的UUID）并继续。</string>
+    <string name="database_opened">数据库开启</string>
+    <string name="clipboard_explanation_summary">使用您设备的剪贴板来复制输入字段</string>
+    <string name="persistent_notification_title">保持通知</string>
+    <string name="persistent_notification_summary">当数据库打开时产生一条通知</string>
+    <string name="advanced_unlock_explanation_summary">使用高级解锁轻松打开数据库</string>
+    <string name="database_data_compression_title">数据压缩</string>
+    <string name="database_data_compression_summary">数据压缩可降低数据库大小。</string>
+    <string name="max_history_items_title">最大历史记录条数</string>
+    <string name="max_history_items_summary">限制每个条目的历史记录条数</string>
+    <string name="max_history_size_title">最大历史记录大小</string>
+    <string name="max_history_size_summary">限制每个条目的历史记录大小（以字节为单位）</string>
+    <string name="settings_database_recommend_changing_master_key_title">建议修改</string>
+    <string name="settings_database_recommend_changing_master_key_summary">建议修改主密钥（以天为单位）</string>
+    <string name="settings_database_force_changing_master_key_title">强制修改</string>
+    <string name="settings_database_force_changing_master_key_summary">强制修改主密钥（以天为单位）</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">下次强制修改</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">下次强制修改主密钥（一次）</string>
+    <string name="database_default_username_title">默认用户名</string>
+    <string name="database_custom_color_title">自定义数据库颜色</string>
+    <string name="compression">压缩</string>
+    <string name="compression_none">无</string>
+    <string name="compression_gzip">GZip压缩</string>
+    <string name="device_keyboard_setting_title">设备键盘设置</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a0a211159..850cdf587 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -19,27 +19,27 @@
 --><resources>
     <string name="about_feedback">回饋</string>
     <string name="about_homepage">首頁</string>
-    <string name="about_description">KeePass DX是兼容KeePass密碼管理軟體的Android版本實現。</string>
+    <string name="about_description">KeePass密碼管理軟體的Android版本。</string>
     <string name="accept">接受</string>
     <string name="add_entry">添加條目</string>
     <string name="add_group">添加群組</string>
     <string name="encryption_algorithm">加密演算法</string>
     <string name="app_timeout">應用程式超時</string>
-    <string name="app_timeout_summary">應用程式處於非活動時鎖定資料庫。</string>
-    <string name="application">應用程式</string>
+    <string name="app_timeout_summary">閒置時間後鎖定資料庫</string>
+    <string name="application">程式</string>
     <string name="menu_app_settings">應用程式設定</string>
     <string name="brackets">括弧</string>
     <string name="file_manager_install_description">流覽檔需要安裝Open Intents File Manager軟體，點下面安裝。由於一些檔管理軟體的差異，在你第一次瀏覽時可能無法正常工作。</string>
     <string name="clipboard_cleared">剪貼板已清除</string>
     <string name="clipboard_timeout">剪貼板超時</string>
-    <string name="clipboard_timeout_summary">複製用戶名或密碼到剪貼板後清除的時間</string>
+    <string name="clipboard_timeout_summary">用戶名或密碼留在剪貼板的時間</string>
     <string name="select_to_copy">複製%1$s到剪貼板</string>
     <string name="retrieving_db_key">創建資料庫密鑰…</string>
     <string name="database">資料庫</string>
     <string name="decrypting_db">解密資料庫內容中…</string>
-    <string name="default_checkbox">使用這作為我的預設資料庫</string>
+    <string name="default_checkbox">以此作為預設資料庫</string>
     <string name="digits">數字</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft；軟體不帶有絕對擔保；是自由軟體，您可在遵循GPL 3或者更高版本的情況下重新發佈。中文簡繁體翻譯：wangkf@gmail.com</string>
+    <string name="disclaimer_formal">KeePass DX © %1$d Kunzisoft；軟體不帶有任何擔保。這是自由軟體，您可在遵循GPL 3或者更高版本的情況下重新發佈。</string>
     <string name="select_database_file">選擇一個已存在之資料庫</string>
     <string name="entry_accessed">訪問時間</string>
     <string name="entry_cancel">取消</string>
@@ -57,15 +57,15 @@
     <string name="error_arc4">ArcFour流密碼不被支援。</string>
     <string name="error_can_not_handle_uri">KeePass DX無法處理此URI。</string>
     <string name="error_file_not_create">不能創建檔案：</string>
-    <string name="error_invalid_db">無效的資料庫或無法辨識的主密鑰。</string>
-    <string name="error_invalid_path">非法路徑。</string>
-    <string name="error_no_name">用戶名是必須的。</string>
-    <string name="error_nokeyfile">密碼或者密鑰檔是必須的。</string>
-    <string name="error_out_of_memory">這款手機運行記憶體不足而不能解析資料庫。這可能是資料庫太大的緣故。</string>
-    <string name="error_pass_gen_type">至少必須選擇一個密碼生成類型</string>
+    <string name="error_invalid_db">無法閱讀資料庫。</string>
+    <string name="error_invalid_path">請確保路徑正確。</string>
+    <string name="error_no_name">請輸入用戶名。</string>
+    <string name="error_nokeyfile">選擇一個密鑰檔。</string>
+    <string name="error_out_of_memory">記憶體不足，無法解析資料庫。</string>
+    <string name="error_pass_gen_type">必須至少選擇一個密碼生成類型。</string>
     <string name="error_pass_match">密碼不正確。</string>
     <string name="error_rounds_too_large">次數太多。最大設置到2147483648。</string>
-    <string name="error_title_required">標題為必填。</string>
+    <string name="error_title_required">添加標題。</string>
     <string name="error_wrong_length">長度欄位輸入一個正整數</string>
     <string name="file_browser">檔案管理器</string>
     <string name="generate_password">生成密碼</string>
@@ -113,7 +113,7 @@
     <string name="root">Root</string>
     <string name="rounds">加密次數</string>
     <string name="rounds_explanation">更高級的加密次數對暴力攻擊能提供額外保護，但也會增加讀取和保存的時間。</string>
-    <string name="rounds_hint">次數</string>
+    <string name="rounds_hint">加密次數</string>
     <string name="saving_database">正在保存資料庫…</string>
     <string name="space">空格</string>
     <string name="search_label">搜尋</string>
@@ -146,10 +146,10 @@
     <string name="extended_ASCII">增強的ASCII</string>
     <string name="allow">允許</string>
     <string name="clipboard_error_title">剪貼簿錯誤</string>
-    <string name="clipboard_error">部份 Samsung 手機在複製到剪貼簿時會產生錯誤，詳細內容：</string>
-    <string name="clipboard_error_clear">清除剪貼簿錯誤</string>
-    <string name="clipboard_swipe_clean">現在清除剪貼簿</string>
-    <string name="error_autofill_enable_service">自動填入服務無法啟用。</string>
+    <string name="clipboard_error">部份 Samsung 手機不容許其他程式使用剪貼簿。</string>
+    <string name="clipboard_error_clear">無法清除剪貼簿</string>
+    <string name="clipboard_swipe_clean">滑动即可清除剪贴板</string>
+    <string name="error_autofill_enable_service">無法啟用自動填入服務。</string>
     <string name="error_move_folder_in_itself">無法移動一個群組至自己本身。</string>
     <string name="invalid_algorithm">無效的演算法。</string>
     <string name="keyfile_does_not_exist">密鑰檔不存在。</string>
@@ -169,6 +169,93 @@
     <string name="read_only_warning">KeePass DX 無法存取資料庫所在位置，將以唯讀模式開啟資料庫。</string>
     <string name="read_only_kitkat_warning">Adnroid 4.4 開始，許多裝置不允許應用程式對 SD 卡進行寫入。</string>
     <string name="encryption">加密</string>
-    <string name="key_derivation_function">金鑰派生函數</string>
+    <string name="key_derivation_function">金鑰推算函數</string>
     <string name="edit_entry">編輯入口</string>
+    <string name="content_description_open_file">開啟檔案</string>
+    <string name="content_description_password_generator">密碼產生器</string>
+    <string name="entry_UUID">UUID</string>
+    <string name="content_description_background">背景</string>
+    <string name="content_description_update_from_list">更新</string>
+    <string name="content_description_keyboard_close_fields">關閉欄位</string>
+    <string name="security">安全</string>
+    <string name="entry_history">歷史</string>
+    <string name="kdf_explanation">為生成加密演算法的金鑰，主金鑰使用隨機跳轉金鑰推算函數進行轉換。</string>
+    <string name="assign_master_key">分配主金鑰</string>
+    <string name="allow_no_password_title">允許沒有主金鑰</string>
+    <string name="content_description_node_children">子節點</string>
+    <string name="content_description_add_node">添加節點</string>
+    <string name="content_description_add_entry">添加條目</string>
+    <string name="content_description_add_group">添加群组</string>
+    <string name="content_description_file_information">檔案資訊</string>
+    <string name="content_description_password_checkbox">密碼核取方塊</string>
+    <string name="content_description_keyfile_checkbox">金鑰檔案核取方塊</string>
+    <string name="content_description_repeat_toggle_password_visibility">重複切換密碼可見性</string>
+    <string name="content_description_entry_icon">條目圖示</string>
+    <string name="content_description_entry_save">條目保存</string>
+    <string name="content_description_password_length">密碼長度</string>
+    <string name="content_description_add_field">添加欄位</string>
+    <string name="content_description_remove_field">刪除欄位</string>
+    <string name="master_key">主密鑰</string>
+    <string name="menu_master_key_settings">主密鑰設定</string>
+    <string name="settings_database_recommend_changing_master_key_title">建議更換</string>
+    <string name="settings_database_recommend_changing_master_key_summary">建議更改主金鑰（天）</string>
+    <string name="settings_database_force_changing_master_key_title">強制更改</string>
+    <string name="settings_database_force_changing_master_key_summary">強制更改主金鑰（天）</string>
+    <string name="settings_database_force_changing_master_key_next_time_title">下次強制更改</string>
+    <string name="settings_database_force_changing_master_key_next_time_summary">下次強制更改主金鑰（一次）</string>
+    <string name="entry_not_found">找不到條目數據。</string>
+    <string name="error_string_key">每個字串必須具有欄位名稱。</string>
+    <string name="field_name">欄位名</string>
+    <string name="field_value">欄位值</string>
+    <string name="file_not_found_content">找不到檔案。嘗試從檔案瀏覽器重新打開它。</string>
+    <string name="omitbackup_summary">從搜尋結果中省略\"備份\"和\"回收站\"組</string>
+    <string name="recentfile_title">最近的檔案歷史記錄</string>
+    <string name="recentfile_summary">記住最近的檔案名</string>
+    <string name="encryption_explanation">用於所有資料的資料庫加密演算法。</string>
+    <string name="memory_usage">記憶體使用情況</string>
+    <string name="memory_usage_explanation">密钥推導函數要使用的記憶體量（以二进制字节为单位）。</string>
+    <string name="parallelism">平行</string>
+    <string name="parallelism_explanation">密鑰推導函數使用的平行性程度（即執行緒數）。</string>
+    <string name="sort_menu">排序</string>
+    <string name="sort_ascending">最低的優先↓</string>
+    <string name="sort_groups_before">群組在前面</string>
+    <string name="sort_recycle_bin_bottom">回收箱在末尾</string>
+    <string name="sort_title">標題</string>
+    <string name="sort_username">用戶名</string>
+    <string name="sort_creation_time">建立時間</string>
+    <string name="sort_last_modify_time">修改時間</string>
+    <string name="sort_last_access_time">訪問時間</string>
+    <string name="search_results">搜尋結果</string>
+    <string name="warning">警告</string>
+    <string name="create_keepass_file">創建新資料庫</string>
+    <string name="error_load_database">無法載入資料庫。</string>
+    <string name="error_load_database_KDF_memory">無法載入金鑰。嘗試降低 KDF\"記憶體使用率\"。</string>
+    <string name="list_entries_show_username_title">顯示用戶名</string>
+    <string name="list_entries_show_username_summary">在條目清單中顯示使用者名</string>
+    <string name="selection_mode">選擇模式</string>
+    <string name="do_not_kill_app">不要殺死應用程式…</string>
+    <string name="error_move_entry_here">不能在此處移動條目。</string>
+    <string name="error_copy_entry_here">不能在此處複製條目。</string>
+    <string name="list_groups_show_number_entries_title">顯示條目數</string>
+    <string name="list_groups_show_number_entries_summary">顯示群組中的條目數</string>
+    <string name="error_create_database_file">無法使用此密碼和金鑰檔創建資料庫。</string>
+    <string name="menu_advanced_unlock_settings">高級解鎖</string>
+    <string name="entry_setup_otp">設置一次性密碼</string>
+    <string name="otp_type">OTP 類型</string>
+    <string name="otp_secret">密碼</string>
+    <string name="otp_period">期間（秒）</string>
+    <string name="otp_counter">計數器</string>
+    <string name="otp_digits">數位</string>
+    <string name="otp_algorithm">算灋</string>
+    <string name="entry_otp">OTP</string>
+    <string name="error_invalid_OTP">無效 OTP 金鑰。</string>
+    <string name="error_disallow_no_credentials">至少需要設置一個憑據。</string>
+    <string name="error_copy_group_here">不能在此處複製群組。</string>
+    <string name="error_otp_secret_key">金鑰必須採用 Base32 格式。</string>
+    <string name="error_otp_counter">計數器必須介於%1$d和%2$d之間。</string>
+    <string name="error_otp_period">時段必須介於%1$d和%2$d秒之間。</string>
+    <string name="creating_database">正在創建資料庫…</string>
+    <string name="menu_security_settings">安全設定</string>
+    <string name="contains_duplicate_uuid">資料庫包含重複的 UUID。</string>
+    <string name="contains_duplicate_uuid_procedure">通過驗證此對話方塊，KeePass DX 將修復問題（通過為重複項生成新的 UUID）並繼續。</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8000d4462..bde35700f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -16,8 +16,7 @@
 
     You should have received a copy of the GNU General Public License
     along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
--->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
+--><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <string name="about_feedback">Feedback</string>
     <string name="about_homepage">Homepage</string>
     <string name="about_description">Android implementation of the KeePass password manager</string>
@@ -64,7 +63,6 @@
     <string name="content_description_update_from_list">Update</string>
     <string name="content_description_remove_from_list">Remove</string>
     <string name="content_description_keyboard_close_fields">Close fields</string>
-
     <!--%1$s is either \"Username\" or \"Password\".-->
     <string name="select_to_copy">Select to copy %1$s to clipboard</string>
     <string name="retrieving_db_key">Retrieving database key…</string>
@@ -109,7 +107,7 @@
     <string name="error_load_database">Could not load your database.</string>
     <string name="error_load_database_KDF_memory">Could not load the key. Try to lower the KDF \"Memory Usage\".</string>
     <string name="error_pass_gen_type">At least one password generation type must be selected.</string>
-    <string name="error_disallow_no_credentials">At lest one credential must be set.</string>
+    <string name="error_disallow_no_credentials">At least one credential must be set.</string>
     <string name="error_pass_match">The passwords do not match.</string>
     <string name="error_rounds_too_large">\"Transformation rounds\" too high. Setting to 2147483648.</string>
     <string name="error_string_key">Each string must have a field name.</string>