diff --git a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.java b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.java
index e56f67db6..87c380df4 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.java
+++ b/app/src/main/java/com/kunzisoft/keepass/database/action/LoadDatabaseRunnable.java
@@ -74,7 +74,7 @@ public class LoadDatabaseRunnable extends RunnableOnFinish {
             catchError(e, R.string.error_arc4);
             return;
         } catch (InvalidPasswordException e) {
-            catchError(e, R.string.InvalidPassword);
+            catchError(e, R.string.invalid_password);
             return;
         } catch (ContentFileNotFoundException e) {
             catchError(e, R.string.file_not_found_content);
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java
index 0c507e45b..99ef87370 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java
+++ b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV3.java
@@ -156,7 +156,7 @@ public class ImporterV3 extends Importer {
 		}
 
 		if (progressTaskUpdater != null)
-            progressTaskUpdater.updateMessage(R.string.creating_db_key);
+            progressTaskUpdater.updateMessage(R.string.retrieving_db_key);
 		databaseToOpen = createDB();
 		databaseToOpen.retrieveMasterKey(password, kfIs);
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java
index 7719019a4..8f395414d 100644
--- a/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java
+++ b/app/src/main/java/com/kunzisoft/keepass/database/load/ImporterV4.java
@@ -101,7 +101,7 @@ public class ImporterV4 extends Importer {
             InvalidDBException {
 
 		if (progressTaskUpdater != null)
-			progressTaskUpdater.updateMessage(R.string.creating_db_key);
+			progressTaskUpdater.updateMessage(R.string.retrieving_db_key);
 		db = new PwDatabaseV4();
 		
 		PwDbHeaderV4 header = new PwDbHeaderV4(db);
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index c7781a784..2587409e6 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -39,7 +39,7 @@
     <string name="clipboard_timeout">Temps d\'espera del porta-retalls</string>
     <string name="clipboard_timeout_summary">Temps abans de netejar el porta-retalls després de copiar un usuari o contrasenya</string>
     <string name="select_to_copy">Selecciona per copiar %1$s al porta-retalls</string>
-    <string name="creating_db_key">Creant clau de base de dades&#8230;</string>
+    <string name="retrieving_db_key">Creant clau de base de dades&#8230;</string>
     <string name="database">Base de dades</string>
     <string name="decrypting_db">Desencriptant continguts de la base de dades&#8230;</string>
     <string name="default_checkbox">Utilitza aquesta com a base de dades per defecte</string>
@@ -89,7 +89,7 @@
     <string name="password">Contrasenya</string>
     <string name="install_from_play_store">Instal·la de la Play Store</string>
     <string name="install_from_f_droid">Instal·la de la F-Droid</string>
-    <string name="InvalidPassword">Contrasenya o arxiu clau invàlids.</string>
+    <string name="invalid_password">Contrasenya o arxiu clau invàlids.</string>
     <string name="invalid_db_sig">Format de base de dades desconegut.</string>
     <string name="length">Longitud</string>
     <string name="list_size_title">Mida de la llista de grups</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index d0a7354fb..4d2b7d93f 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -43,7 +43,7 @@
     <string name="clipboard_timeout">Časový limit schránky</string>
     <string name="clipboard_timeout_summary">Čas před vyčištěním schránky po zkopírování jména nebo hesla</string>
     <string name="select_to_copy">Kopírovat %1$s do schránky</string>
-    <string name="creating_db_key">Vytvářím databázový klíč&#8230;</string>
+    <string name="retrieving_db_key">Vytvářím databázový klíč&#8230;</string>
     <string name="database">Databáze</string>
     <string name="decrypting_db">Dešifruji obsah databáze&#8230;</string>
     <string name="default_checkbox">Použít jako výchozí databázi</string>
@@ -97,7 +97,7 @@
     <string name="password">Heslo</string>
     <string name="install_from_play_store">Instalovat z Play</string>
     <string name="install_from_f_droid">Instalovat z F-Droid</string>
-    <string name="InvalidPassword">Chybné heslo nebo klíčový soubor.</string>
+    <string name="invalid_password">Chybné heslo nebo klíčový soubor.</string>
     <string name="invalid_algorithm">Chybný algoritmus.</string>
     <string name="invalid_db_sig">Databázový formát nelze rozpoznat.</string>
     <string name="keyfile_does_not_exist">Klíčový soubor neexistuje.</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 81206a528..b0c829a07 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -42,7 +42,7 @@
     <string name="clipboard_timeout">Udklipsholder timeout</string>
     <string name="clipboard_timeout_summary">Tid før udklipsholderen bliver ryddet efter kopiering af brugernavn eller adgangskode</string>
     <string name="select_to_copy">Vælg for at kopiere %1$s til udklipsholderen</string>
-    <string name="creating_db_key">Opretter databasenøgle&#8230;</string>
+    <string name="retrieving_db_key">Opretter databasenøgle&#8230;</string>
     <string name="database">Database</string>
     <string name="decrypting_db">Dekrypterer databaseindhold&#8230;</string>
     <string name="default_checkbox">Brug denne database som standard</string>
@@ -96,7 +96,7 @@
     <string name="password">Adgangskode</string>
     <string name="install_from_play_store">Installer fra Play Butik</string>
     <string name="install_from_f_droid">Installer fra F-Droid</string>
-    <string name="InvalidPassword">Ugyldig adgangskode eller nøglefil.</string>
+    <string name="invalid_password">Ugyldig adgangskode eller nøglefil.</string>
     <string name="invalid_algorithm">Ugyldig algoritme.</string>
     <string name="invalid_db_sig">Databaseformatet blev ikke genkendt.</string>
     <string name="keyfile_does_not_exist">Nøglefil eksisterer ikke.</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e93b7217b..7aa2e16d2 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -45,7 +45,7 @@
     <string name="clipboard_timeout">Zwischenablagesperre</string>
     <string name="clipboard_timeout_summary">Zeit nach dem Kopieren eines Benutzernamens oder Passworts, bevor die Zwischenablage geleert wird</string>
     <string name="select_to_copy">%1$s in die Zwischenablage kopieren</string>
-    <string name="creating_db_key">Datenbank-Schlüsseldatei erzeugen\u2026</string>
+    <string name="retrieving_db_key">Datenbank-Schlüsseldatei erzeugen\u2026</string>
     <string name="database">Datenbank</string>
     <string name="decrypting_db">Entschlüsselung der Datenbankinhalte\u2026</string>
     <string name="default_checkbox">Als Standard-Datenbank benutzen</string>
@@ -100,7 +100,7 @@
     <string name="password">Passwort</string>
     <string name="install_from_play_store">Google Play</string>
     <string name="install_from_f_droid">F-Droid</string>
-    <string name="InvalidPassword">Passwort oder Schlüsseldatei ist falsch.</string>
+    <string name="invalid_password">Passwort oder Schlüsseldatei ist falsch.</string>
     <string name="invalid_algorithm">Ungültiger Algorithmus.</string>
     <string name="invalid_db_sig">Datenbankformat wurde nicht erkannt.</string>
     <string name="keyfile_does_not_exist">Schlüsseldatei existiert nicht.</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index bc2f116ab..2dbfa572f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -40,7 +40,7 @@
     <string name="clipboard_timeout">Λήξη χρονικού ορίου προχείρου</string>
     <string name="clipboard_timeout_summary">Χρόνος προτού γίνει εκκαθάριση του προχείρου μετά από αντιγραφή ονόματος χρήστη ή κωδικού πρόσβασης</string>
     <string name="select_to_copy">Επιλέξτε για αντιγραφή %1$s στο πρόχειρο</string>
-    <string name="creating_db_key">Δημιουργία κλειδιού βάσης δεδομένων&#8230;</string>
+    <string name="retrieving_db_key">Δημιουργία κλειδιού βάσης δεδομένων&#8230;</string>
     <string name="database">Βάση Δεδομένων</string>
     <string name="decrypting_db">Αποκρυπτογράφηση περιεχομένων βάσης δεδομένων&#8230;</string>
     <string name="default_checkbox">Χρήση αυτής της βάσης ως προεπιλεγμένη</string>
@@ -94,7 +94,7 @@
     <string name="password">Κωδικός Πρόσβασης</string>
     <string name="install_from_play_store">Εγκατάσταση από το Play Store</string>
     <string name="install_from_f_droid">Εγκατάσταση από το F-Droid</string>
-    <string name="InvalidPassword">Εσφαλμένος κωδικός ή αρχείο κλειδιού.</string>
+    <string name="invalid_password">Εσφαλμένος κωδικός ή αρχείο κλειδιού.</string>
     <string name="invalid_algorithm">Εσφαλμένος αλγόριθμος.</string>
     <string name="invalid_db_sig">Η μορφή της Βάσης Δεδομένων δεν αναγνωρίζεται.</string>
     <string name="keyfile_does_not_exist">Δεν υπάρχει αρχείο κλειδιού.</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 60dba06ec..fc0939e92 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -38,7 +38,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="clipboard_timeout">Portapapeles caducado</string>
     <string name="clipboard_timeout_summary">Tiempo hasta que el portapapeles se vacía después de copiar el usuario o la contraseña</string>
     <string name="select_to_copy">Seleccionar para copiar %1$s al portapapeles</string>
-    <string name="creating_db_key">Creando clave de la base de datos…</string>
+    <string name="retrieving_db_key">Creando clave de la base de datos…</string>
     <string name="database">Base de datos</string>
     <string name="decrypting_db">Descifrando el contenido de la base de datos…</string>
     <string name="default_checkbox">Utilice esto como base de datos por defecto</string>
@@ -88,7 +88,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="hint_pass">contraseña</string>
     <string name="install_from_play_store">Instalar desde Play Store</string>
     <string name="install_from_f_droid">Instalar desde F-Droid</string>
-    <string name="InvalidPassword">Contraseña o archivo de clave no válido.</string>
+    <string name="invalid_password">Contraseña o archivo de clave no válido.</string>
     <string name="invalid_db_sig">Formato de base de datos no reconocido.</string>
     <string name="length">Longitud</string>
     <string name="list_size_title">Tamaño de la lista de Grupo</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index baec2a0b5..94b2091a4 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -42,7 +42,7 @@
     <string name="clipboard_timeout">Arbela denbora pasatu da</string>
     <string name="clipboard_timeout_summary">Erabiltzaile izena edo pasahitza kopiatu ondoren arbela ezabatzeko igaro beharreko denbora</string>
     <string name="select_to_copy">Aukeratu %1$s arbelera kopiatzeko</string>
-    <string name="creating_db_key">Datubasearen gakoa sortzen&#8230;</string>
+    <string name="retrieving_db_key">Datubasearen gakoa sortzen&#8230;</string>
     <string name="database">Datubasea</string>
     <string name="decrypting_db">Datubasearen datuak desenkriptatzen&#8230;</string>
     <string name="default_checkbox">Hau erabili modu lehenetsitako datubase gisa</string>
@@ -96,7 +96,7 @@
     <string name="password">Pasahitza</string>
     <string name="install_from_play_store">Play store-etik Instalatu</string>
     <string name="install_from_f_droid">F-Droid-etik Instalatu</string>
-    <string name="InvalidPassword">Pasahitz edo gako fitxategi baliogabea.</string>
+    <string name="invalid_password">Pasahitz edo gako fitxategi baliogabea.</string>
     <string name="invalid_algorithm">Algoritmo baliogabea.</string>
     <string name="invalid_db_sig">Datubase formato ez ezaguna.</string>
     <string name="keyfile_does_not_exist">Gako fitxategia ez da esistitzen.</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 8a0a6644b..a2048e90f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -40,7 +40,7 @@
     <string name="clipboard_timeout">Leikepöydän aikakatkaisu</string>
     <string name="clipboard_timeout_summary">Aika, jonka jälkeen leikepöytä tyhjennetään käyttäjätunnuksen tai salasanan kopioinnin jälkeen</string>
     <string name="select_to_copy">Valitse kopioidaksesi %1$s</string>
-    <string name="creating_db_key">Luodaan tietokanta-avainta&#8230;</string>
+    <string name="retrieving_db_key">Luodaan tietokanta-avainta&#8230;</string>
     <string name="database">Tietokanta</string>
     <string name="decrypting_db">Puretaan tietokannan salausta&#8230;</string>
     <string name="default_checkbox">Käytä tätä oletustietokantana</string>
@@ -94,7 +94,7 @@
     <string name="password">Salasana</string>
     <string name="install_from_play_store">Asenna Play Storesta</string>
     <string name="install_from_f_droid">Asenna F-Droid</string>
-    <string name="InvalidPassword">Väärä salasana tai avaintiedosto.</string>
+    <string name="invalid_password">Väärä salasana tai avaintiedosto.</string>
     <string name="invalid_algorithm">Epäkelpo algoritmi.</string>
     <string name="invalid_db_sig">Salasanatietokannan tyyppiä ei tunnistettu.</string>
     <string name="keyfile_does_not_exist">Avaintiedostoa ei ole olemassa.</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a78cee902..0b24b51e6 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -47,7 +47,7 @@
     <string name="clipboard_timeout_summary">Temps avant le vidage du presse-papier après copie du nom d\'utilisateur ou du mot de passe</string>
     <string name="clipboard_swipe_clean">Balayez pour effacer le presse-papiers maintenant</string>
     <string name="select_to_copy">Copier %1$s dans le presse-papier</string>
-    <string name="creating_db_key">Création de la clé de base de données…</string>
+    <string name="retrieving_db_key">Création de la clé de base de données…</string>
     <string name="database">Base de données</string>
     <string name="decrypting_db">Déchiffrement du contenu de la base de données…</string>
     <string name="default_checkbox">Utiliser comme base de données par défaut</string>
@@ -102,7 +102,7 @@
     <string name="password">Mot de passe</string>
     <string name="install_from_play_store">Installer depuis Google Play</string>
     <string name="install_from_f_droid">Installer depuis F-Droid</string>
-    <string name="InvalidPassword">Mot de passe ou fichier de clé invalide.</string>
+    <string name="invalid_password">Mot de passe ou fichier de clé invalide.</string>
     <string name="invalid_algorithm">Algorithme invalide.</string>
     <string name="invalid_db_sig">Format de base de données non reconnu.</string>
     <string name="keyfile_does_not_exist">Le fichier de clé n\'existe pas.</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index cec070f67..8144678a1 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -37,7 +37,7 @@
     <string name="clipboard_timeout">Vágólap időkorlátja</string>
     <string name="clipboard_timeout_summary">Beállíthatja, mennyi idő után kerüljön törlésre a vágólap</string>
     <string name="select_to_copy">%1$s másolása a vágólapra</string>
-    <string name="creating_db_key">Adatbázis létrehozása…</string>
+    <string name="retrieving_db_key">Adatbázis létrehozása…</string>
     <string name="database">Adatbázis</string>
     <string name="decrypting_db">Adatbázis tartalmának dekódolása…</string>
     <string name="default_checkbox">Adatbázis beállítása alapértelmezettként</string>
@@ -91,7 +91,7 @@
     <string name="password">Jelszó</string>
     <string name="install_from_play_store">Letöltés a Google Play-ről</string>
     <string name="install_from_f_droid">Letöltés a F-Droid</string>
-    <string name="InvalidPassword">Érvénytelen jelszó vagy kulcsfájl.</string>
+    <string name="invalid_password">Érvénytelen jelszó vagy kulcsfájl.</string>
     <string name="invalid_algorithm">Érvénytelen algoritmus.</string>
     <string name="invalid_db_sig">Az adabázis formátuma nem ismert.</string>
     <string name="keyfile_does_not_exist">A kulcsfájl nem létezik.</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 638e281c5..547660ba3 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -43,7 +43,7 @@
     <string name="clipboard_timeout">Scadenza appunti</string>
     <string name="clipboard_timeout_summary">Tempo prima di eliminare gli appunti dopo la copia del nome file o password</string>
     <string name="select_to_copy">Copia %1$s negli appunti</string>
-    <string name="creating_db_key">Creazione file chiave database…</string>
+    <string name="retrieving_db_key">Creazione file chiave database…</string>
     <string name="database">Database</string>
     <string name="decrypting_db">Decodifica contenuto database…</string>
     <string name="default_checkbox">Usa come database predefinito</string>
@@ -97,7 +97,7 @@
     <string name="hint_pass">password</string>
     <string name="install_from_play_store">Installa dal Play Store</string>
     <string name="install_from_f_droid">Installa dal F-Droid</string>
-    <string name="InvalidPassword">Password o file chiave non validi.</string>
+    <string name="invalid_password">Password o file chiave non validi.</string>
     <string name="invalid_algorithm">Algoritmo non valido.</string>
     <string name="invalid_db_sig">Formato database non riconosciuto.</string>
     <string name="keyfile_does_not_exist">Il file chiave non esiste.</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 970fd5c63..56953c34a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -41,7 +41,7 @@
     <string name="clipboard_timeout">זמן עד לניקוי לוח ההעתקה</string>
     <string name="clipboard_timeout_summary">זמן לפני שלוח ההעתקה מנוקה לאחר העתקת שם משתמש או סיסמה</string>
     <string name="select_to_copy">בחר בהעתקת %1$s ללוח ההעתקה</string>
-    <string name="creating_db_key">יוצר מפתח מסד נתונים&#8230;</string>
+    <string name="retrieving_db_key">יוצר מפתח מסד נתונים&#8230;</string>
     <string name="database">מסד נתונים</string>
     <string name="decrypting_db">מפענח תוכן מסד נתונים&#8230;</string>
     <string name="default_checkbox">השתמש בזה כמסד הנתונים הברירת מחדל</string>
@@ -93,7 +93,7 @@
     <string name="password">סיסמה</string>
     <string name="install_from_play_store">התקן מחנות Play</string>
     <string name="install_from_f_droid">התקן מהאינטרנט</string>
-    <string name="InvalidPassword">סיסמה או קובץ מפתח לא מתאימים.</string>
+    <string name="invalid_password">סיסמה או קובץ מפתח לא מתאימים.</string>
     <string name="invalid_algorithm">אלגוריתם לא חוקי.</string>
     <string name="invalid_db_sig">תבנית מסד הנתונים אינה מזוהה.</string>
     <string name="keyfile_does_not_exist">קובץ המפתח לא קיים.</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index a7c5b6838..01a5a9a15 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">クリップボード タイムアウト</string>
     <string name="clipboard_timeout_summary">コピーした情報をクリップボードから消去する時間</string>
     <string name="select_to_copy">ここをタップすると%1$sをクリップボードにコピーします</string>
-    <string name="creating_db_key">データベース認証中&#8230;</string>
+    <string name="retrieving_db_key">データベース認証中&#8230;</string>
     <string name="database">データベース</string>
     <string name="decrypting_db">データベースを解析中&#8230;</string>
     <string name="default_checkbox">このデータベースを次回以降も利用する</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">パスワード</string>
     <string name="install_from_play_store">Play Storeで入手</string>
     <string name="install_from_f_droid">F-Droidで入手</string>
-    <string name="InvalidPassword">パスワード/キーファイルが違います。</string>
+    <string name="invalid_password">パスワード/キーファイルが違います。</string>
     <string name="invalid_db_sig">データベースフォーマットが認識できません。</string>
     <string name="length">生成するパスワードの長さ</string>
     <string name="list_size_title">グループ一覧サイズ</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index d5ec56621..8b6cbf3df 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -3,7 +3,7 @@
     <string name="about_description">KeePass DX yra KeePass slaptažodžių tvarkyklės realizacija Android platformai</string>
     <string name="clipboard_cleared">Iškarpinė išvalyta.</string>
     <string name="file_not_found">Failas nerastas.</string>
-    <string name="InvalidPassword">Neteisingas slaptažodis arba rakto failas.</string>
+    <string name="invalid_password">Neteisingas slaptažodis arba rakto failas.</string>
     <string name="about_feedback">Atsiliepimai:</string>
     <string name="about_homepage">Pagrindinis puslapis:</string>
     <string name="accept">Priimti</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index dc429ba70..aec737897 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -22,7 +22,7 @@
     <string name="clipboard_timeout">Starpliktuves taimauts</string>
     <string name="clipboard_timeout_summary">Notīrīšanas taimauts pēc lietotājvārda vai paroles kopēšana starpliktuvē</string>
     <string name="select_to_copy">%1$s uz starpliktuvi</string>
-    <string name="creating_db_key">Izveidot datu bāzes atslēgu…</string>
+    <string name="retrieving_db_key">Izveidot datu bāzes atslēgu…</string>
     <string name="database">Datu bāze</string>
     <string name="decrypting_db">Datu bāzes atšifrēšana…</string>
     <string name="default_checkbox">Izmantot šo kā manu noklusējuma datu bāzi</string>
@@ -74,7 +74,7 @@
     <string name="password">Parole</string>
     <string name="install_from_play_store">Instalēt no Play veikala</string>
     <string name="install_from_f_droid">Instalēt no F-Droid</string>
-    <string name="InvalidPassword">Nederīga parole vai atslēgas fails.</string>
+    <string name="invalid_password">Nederīga parole vai atslēgas fails.</string>
     <string name="invalid_algorithm">Nederīgs algoritms.</string>
     <string name="invalid_db_sig">Datu bāzes formāts nav atpazīts.</string>
     <string name="keyfile_does_not_exist">Atslēgas fails nepastāv.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 2bacfa3a1..ce264108c 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -38,7 +38,7 @@
     <string name="clipboard_timeout">Klembordtimeout</string>
     <string name="clipboard_timeout_summary">Tijd tussen het kopiëren van gebruikersnaam of wachtwoord en het wissen van het klembord</string>
     <string name="select_to_copy">Selecteer om %1$s naar klembord te kopiëren</string>
-    <string name="creating_db_key">Databasesleutel wordt aangemaakt&#8230;</string>
+    <string name="retrieving_db_key">Databasesleutel wordt aangemaakt&#8230;</string>
     <string name="database">Database</string>
     <string name="decrypting_db">Databaseinhoud wordt ontcijferd&#8230;</string>
     <string name="default_checkbox">Gebruik dit als mijn standaard database</string>
@@ -88,7 +88,7 @@
     <string name="hint_pass">wachtwoord</string>
     <string name="install_from_play_store">Installeer van Play Store</string>
     <string name="install_from_f_droid">Installeer van F-Droid</string>
-    <string name="InvalidPassword">Ongeldig wachtwoord of sleutelbestand.</string>
+    <string name="invalid_password">Ongeldig wachtwoord of sleutelbestand.</string>
     <string name="invalid_db_sig">Databaseformaat niet herkend.</string>
     <string name="length">Lengte</string>
     <string name="list_size_title">Grootte van de groepslijst</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 8cdee2d18..b937781b6 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">Tidsavbrot på utklippstavla</string>
     <string name="clipboard_timeout_summary">Tid før utklippstavla blir tømt etter at brukarnamnet eller passordet er kopiert.</string>
     <string name="select_to_copy">Kopier %1$s til utklippstavla</string>
-    <string name="creating_db_key">Lagar databasenøkkelen …</string>
+    <string name="retrieving_db_key">Lagar databasenøkkelen …</string>
     <string name="database">Database</string>
     <string name="decrypting_db">Dekrypterer databasen …</string>
     <string name="default_checkbox">Standarddatabasen</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">passord</string>
     <string name="install_from_play_store">Installer frå Play Store</string>
     <string name="install_from_f_droid">Installer frå F-Droid</string>
-    <string name="InvalidPassword">Ugyldig passord eller nøkkelfil.</string>
+    <string name="invalid_password">Ugyldig passord eller nøkkelfil.</string>
     <string name="invalid_db_sig">Ukjent databaseformat.</string>
     <string name="length">Lengd</string>
     <string name="list_size_title">Gruppelistestorleik</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 4c8ee6d43..1a962644e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -35,7 +35,7 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="clipboard_timeout">Czas wygaśnięcia schowka</string>
     <string name="clipboard_timeout_summary">Czas do wyczyszczenia zawartości schowka po kopiowaniu nazwy użytkownika i hasła</string>
     <string name="select_to_copy">Kopiuj %1$s do schowka</string>
-    <string name="creating_db_key">Tworzenie klucza bazy danych&#8230;</string>
+    <string name="retrieving_db_key">Tworzenie klucza bazy danych&#8230;</string>
     <string name="database">Baza danych</string>
     <string name="decrypting_db">Deszyfracja bazy danych&#8230;</string>
     <string name="default_checkbox">Używaj tej bazy danych jako domyślnej</string>
@@ -84,7 +84,7 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="hint_pass">hasło</string>
     <string name="install_from_play_store">Zainstaluj z Play-Store</string>
     <string name="install_from_f_droid">Zainstaluj z F-Droid</string>
-    <string name="InvalidPassword">Nieprawidłowe hasło lub plik klucza.</string>
+    <string name="invalid_password">Nieprawidłowe hasło lub plik klucza.</string>
     <string name="invalid_db_sig">Format bazy danych nierozpoznany.</string>
     <string name="length">Długość</string>
     <string name="list_size_title">Wielkość listy grup</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a873eac7c..e2810b8de 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -39,7 +39,7 @@
     <string name="clipboard_timeout">Tempo limite para o clipboard</string>
     <string name="clipboard_timeout_summary">Tempo até limpar a área de transferência após copiar usuário ou senha</string>
     <string name="select_to_copy">Copiar %1$s para o clipboard</string>
-    <string name="creating_db_key">Criando a chave do banco de dados…</string>
+    <string name="retrieving_db_key">Criando a chave do banco de dados…</string>
     <string name="database">Banco de Dados</string>
     <string name="decrypting_db">Decifrando conteúdo do banco de dados…</string>
     <string name="default_checkbox">Usar este banco de dados como padrão</string>
@@ -89,7 +89,7 @@
     <string name="hint_pass">senha</string>
     <string name="install_from_play_store">Instalar a partir do Google Play</string>
     <string name="install_from_f_droid">Instalar a partir do F-Droid</string>
-    <string name="InvalidPassword">Senha ou arquivo de chaves inválidos.</string>
+    <string name="invalid_password">Senha ou arquivo de chaves inválidos.</string>
     <string name="invalid_db_sig">O formato do banco de dados não foi reconhecido.</string>
     <string name="length">Tamanho</string>
     <string name="list_size_title">Tamanho da lista de grupos</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index f568a7f79..a0e361234 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -43,7 +43,7 @@
     <string name="clipboard_timeout">Tempo de espera da área de transferência</string>
     <string name="clipboard_timeout_summary">Tempo antes da limpeza da área de transferência depois de copiado o nome de utilizador ou a palavra-passe.</string>
     <string name="select_to_copy">Selecione para copiar %1$s para a área de transferência</string>
-    <string name="creating_db_key">A criar a chave da base de dados&#8230;</string>
+    <string name="retrieving_db_key">A criar a chave da base de dados&#8230;</string>
     <string name="database">Base de dados</string>
     <string name="decrypting_db">A desencriptar conteúdo da base de dados&#8230;</string>
     <string name="default_checkbox">Utilizar esta base de dados como predefinida</string>
@@ -98,7 +98,7 @@
     <string name="password">Palavra-passe</string>
     <string name="install_from_play_store">Instalar pela Play Store</string>
     <string name="install_from_f_droid">Instalar pela F-Droid</string>
-    <string name="InvalidPassword">Palavra-passe ou ficheiro chave inválidos.</string>
+    <string name="invalid_password">Palavra-passe ou ficheiro chave inválidos.</string>
     <string name="invalid_algorithm">Algoritmo inválido.</string>
     <string name="invalid_db_sig">Formato da base de dados não reconhecido.</string>
     <string name="keyfile_does_not_exist">O ficheiro chave não existe.</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bdb8974f3..8166c3eeb 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -41,7 +41,7 @@
     <string name="clipboard_timeout">Очистка буфера</string>
     <string name="clipboard_timeout_summary">Задержка очистки после копирования в буфер</string>
     <string name="select_to_copy">%1$s – в буфер</string>
-    <string name="creating_db_key">Создание ключа…</string>
+    <string name="retrieving_db_key">Создание ключа…</string>
     <string name="database">База</string>
     <string name="decrypting_db">Расшифровка базы…</string>
     <string name="default_checkbox">По умолчанию</string>
@@ -96,7 +96,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="InvalidPassword">Неверный пароль или файл-ключ</string>
+    <string name="invalid_password">Неверный пароль или файл-ключ</string>
     <string name="invalid_algorithm">Неверный криптоалгоритм</string>
     <string name="invalid_db_sig">Формат базы не определён</string>
     <string name="keyfile_does_not_exist">Файл-ключ не найден</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 091da57a1..587b9aa40 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">Timeout Schránky</string>
     <string name="clipboard_timeout_summary">Čas pred vyčistením schránky po skopírovaní mena alebo hesla</string>
     <string name="select_to_copy">%1$s skopírované do schránky</string>
-    <string name="creating_db_key">Vytváram databázový kľúč&#8230;</string>
+    <string name="retrieving_db_key">Vytváram databázový kľúč&#8230;</string>
     <string name="database">Databáza</string>
     <string name="decrypting_db">Dešifrujem obsah databázy&#8230;</string>
     <string name="default_checkbox">Použiť toto ako predvolenú databázu</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">heslo</string>
     <string name="install_from_play_store">Inštalovať z Play Store</string>
     <string name="install_from_f_droid">Inštalovať z F-Droid</string>
-    <string name="InvalidPassword">Chybné heslo, alebo súbor keyfile.</string>
+    <string name="invalid_password">Chybné heslo, alebo súbor keyfile.</string>
     <string name="invalid_db_sig">Formát Databázy nerozpoznaný.</string>
     <string name="length">Dĺžka</string>
     <string name="list_size_title">Dĺžka zoznamu skupiny</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 11f54af5a..46f15905e 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -42,7 +42,7 @@
     <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="select_to_copy">Kopiera %1$s till urklipp</string>
-    <string name="creating_db_key">Skapar databasnyckel&#8230;</string>
+    <string name="retrieving_db_key">Skapar databasnyckel&#8230;</string>
     <string name="database">Databas</string>
     <string name="decrypting_db">Dekrypterar databasinnehåll&#8230;</string>
     <string name="default_checkbox">Använda denna databasen som standard</string>
@@ -95,7 +95,7 @@
     <string name="password">Lösenord</string>
     <string name="install_from_play_store">Installera från Play Store</string>
     <string name="install_from_f_droid">Installera från F-Droid</string>
-    <string name="InvalidPassword">Ogiltigt lösenord eller nyckelfil.</string>
+    <string name="invalid_password">Ogiltigt lösenord eller nyckelfil.</string>
     <string name="invalid_algorithm">Ogiltig algoritm.</string>
     <string name="invalid_db_sig">Databasformatet är okänt.</string>
     <string name="keyfile_does_not_exist">Nyckelfilen existerar inte.</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 236e18207..322697f59 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">Тайм-аут буфера обміну</string>
     <string name="clipboard_timeout_summary">Час через який буде очищено буфер обміну після копіювання ім’я користувача чи пароля</string>
     <string name="select_to_copy">Копіювати %1$s до буфера обміну</string>
-    <string name="creating_db_key">Створення ключа бази даних&#8230;</string>
+    <string name="retrieving_db_key">Створення ключа бази даних&#8230;</string>
     <string name="database">База даних</string>
     <string name="decrypting_db">Розшифрування змісту бази даних&#8230;</string>
     <string name="default_checkbox">Використовувати як мою типову базу даних</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">пароль</string>
     <string name="install_from_play_store">Інсталювати із Google Play</string>
     <string name="install_from_f_droid">Інсталювати із F-Droid</string>
-    <string name="InvalidPassword">Невірний пароль або файл ключа.</string>
+    <string name="invalid_password">Невірний пароль або файл ключа.</string>
     <string name="invalid_db_sig">Формат бази даних не розпізнано.</string>
     <string name="length">Довжина</string>
     <string name="list_size_title">Розмір списку груп</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 61c0e805e..991fe911a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">剪贴板超时</string>
     <string name="clipboard_timeout_summary">复制用户名或密码到剪贴板后清除的时间</string>
     <string name="select_to_copy">复制%1$s到剪贴板</string>
-    <string name="creating_db_key">创建数据库密钥…</string>
+    <string name="retrieving_db_key">创建数据库密钥…</string>
     <string name="database">数据库</string>
     <string name="decrypting_db">解密数据库内容中…</string>
     <string name="default_checkbox">使用这做为我的默认数据库</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">密码</string>
     <string name="install_from_play_store">从电子市场安装</string>
     <string name="install_from_f_droid">从网络安装</string>
-    <string name="InvalidPassword">非法的密码或密钥文件。</string>
+    <string name="invalid_password">非法的密码或密钥文件。</string>
     <string name="invalid_db_sig">数据库格式无法识别。</string>
     <string name="length">长度</string>
     <string name="list_size_title">群列表尺寸</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e7d18b337..39bf2f23a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -36,7 +36,7 @@
     <string name="clipboard_timeout">剪貼板超時</string>
     <string name="clipboard_timeout_summary">複製用戶名或密碼到剪貼板後清除的時間</string>
     <string name="select_to_copy">複製%1$s到剪貼板</string>
-    <string name="creating_db_key">創建資料庫密鑰…</string>
+    <string name="retrieving_db_key">創建資料庫密鑰…</string>
     <string name="database">資料庫</string>
     <string name="decrypting_db">解密資料庫內容中…</string>
     <string name="default_checkbox">使用這作為我的預設資料庫</string>
@@ -86,7 +86,7 @@
     <string name="hint_pass">密碼</string>
     <string name="install_from_play_store">從 Play 商店安裝</string>
     <string name="install_from_f_droid">從 F-Droid 安裝</string>
-    <string name="InvalidPassword">無效的密碼或密鑰檔。</string>
+    <string name="invalid_password">無效的密碼或密鑰檔。</string>
     <string name="invalid_db_sig">資料庫格式無法識別。</string>
     <string name="length">長度</string>
     <string name="list_size_title">群列表尺寸</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index af75610c9..158370a57 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,108 +18,109 @@
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
 <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">KeePass DX is an Android implementation of the KeePass password manager.</string>
+    <string name="about_feedback">Feedback</string>
+    <string name="about_homepage">Homepage</string>
+    <string name="about_description">Android implementation of the KeePass password manager</string>
     <string name="accept">Accept</string>
     <string name="add_entry">Add entry</string>
     <string name="edit_entry">Edit entry</string>
     <string name="add_group">Add group</string>
     <string name="add_string">Add string</string>
     <string name="encryption">Encryption</string>
-    <string name="encryption_algorithm">Encryption Algorithm</string>
-    <string name="key_derivation_function">Key Derivation Function</string>
+    <string name="encryption_algorithm">Encryption algorithm</string>
+    <string name="key_derivation_function">Key derivation function</string>
     <string name="app_timeout">App timeout</string>
-    <string name="app_timeout_summary">Time before locking database when the app is inactive</string>
+    <string name="app_timeout_summary">Inactivity before the app is locked</string>
     <string name="application">App</string>
     <string name="beta_dontask">Don\'t show again</string>
     <string name="brackets">Brackets</string>
     <string name="extended_ASCII">Extended ASCII</string>
-    <string name="browser_intall_text">File browsing requires the OpenIntents File Manager to be installed, click below to do so. Due to some quirks in the file manager, browsing may not work correctly the first time around.</string>
+    <string name="browser_intall_text">Browse files by installing the OpenIntents File Manager</string>
     <string name="cancel">Cancel</string>
     <string name="allow">Allow</string>
     <string name="clipboard_cleared">Clipboard cleared</string>
     <string name="clipboard_error_title">Clipboard error</string>
-    <string name="clipboard_error">Some Samsung Android phones have a bug in the clipboard implementation causing copying from apps to fail. More details:</string>
-    <string name="clipboard_error_clear">Clearing the clipboard failed</string>
+    <string name="clipboard_error">Some Samsung Android phones won\'t let apps use the clipboard.</string>
+    <string name="clipboard_error_clear">Could not clear clipboard</string>
     <string name="clipboard_timeout">Clipboard timeout</string>
-    <string name="clipboard_timeout_summary">Time before clearing clipboard after copying username or password</string>
-    <string name="clipboard_swipe_clean">Swipe to clean clipboard now</string>
+    <string name="clipboard_timeout_summary">Time copied usernames or passwords are stored in the clipboard</string>
+    <string name="clipboard_swipe_clean">Swipe to clear clipboard now</string>
+     <!--%1$s is either \"Username\" or \"Password\".-->
     <string name="select_to_copy">Select to copy %1$s to clipboard</string>
-    <string name="creating_db_key">Creating database key…</string>
+    <string name="retrieving_db_key">Retrieving database key…</string>
     <string name="database">Database</string>
-    <string name="decrypting_db">Decrypting database contents…</string>
-    <string name="default_checkbox">Use this as default database</string>
+    <string name="decrypting_db">Decrypting database content…</string>
+    <string name="default_checkbox">Use as default database</string>
     <string name="digits">Digits</string>
-    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft comes with ABSOLUTELY NO WARRANTY; This is free software, and you are welcome to redistribute it under the conditions of the GPL version 3 or later.</string>
+    <string name="disclaimer_formal">KeePass DX \u00A9 %1$d Kunzisoft comes with ABSOLUTELY NO WARRANTY; This is libre software, and you are welcome to redistribute it under the conditions of the GPL version 3 or later.</string>
     <string name="entry_accessed">Accessed</string>
     <string name="entry_cancel">Cancel</string>
     <string name="entry_comment">Comments</string>
     <string name="entry_confpassword">Confirm password</string>
     <string name="entry_created">Created</string>
     <string name="entry_expires">Expires</string>
-    <string name="entry_keyfile">Key file</string>
+    <string name="entry_keyfile">Keyfile</string>
     <string name="entry_modified">Modified</string>
-    <string name="entry_not_found">Entry data not found.</string>
+    <string name="entry_not_found">Could not find entry data.</string>
     <string name="entry_password">Password</string>
     <string name="entry_save">Save</string>
     <string name="entry_title">Title</string>
     <string name="entry_url">URL</string>
     <string name="entry_user_name">Username</string>
     <string name="error_arc4">The ARCFOUR stream cipher is not supported.</string>
-    <string name="error_can_not_handle_uri">KeePass DX cannot handle this URI.</string>
+    <string name="error_can_not_handle_uri">Could not handle this URI in KeePass DX.</string>
     <string name="error_could_not_create_parent">Could not create parent directory.</string>
     <string name="error_database_exists">This file already exists.</string>
     <string name="error_failed_to_launch_link">Could not open link.</string>
-    <string name="error_filename_required">A filename is required.</string>
+    <string name="error_filename_required">Enter a filename.</string>
     <string name="error_file_not_create">Could not create file:</string>
-    <string name="error_invalid_db">Invalid database or unrecognized master key.</string>
-    <string name="error_invalid_path">Invalid path.</string>
-    <string name="error_no_name">A name is required.</string>
-    <string name="error_nokeyfile">A keyfile is required.</string>
-    <string name="error_out_of_memory">The phone ran out of memory while parsing your database. It may be too large for your device.</string>
-    <string name="error_load_database">Database can\'t be load</string>
-    <string name="error_load_database_KDF_memory">Unable to load the key, try to decrease the memory used by the KDF.</string>
-    <string name="error_pass_gen_type">At least one password generation type must be selected</string>
+    <string name="error_invalid_db">Could not read database.</string>
+    <string name="error_invalid_path">Make sure the path is correct.</string>
+    <string name="error_no_name">Enter a name.</string>
+    <string name="error_nokeyfile">Select a keyfile.</string>
+    <string name="error_out_of_memory">No memory to load your entire database.</string>
+    <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_pass_match">The passwords do not match.</string>
-    <string name="error_rounds_not_number">\"Rounds\" must be a number.</string>
-    <string name="error_rounds_too_large">\"Rounds\" too big. Setting to 2147483648.</string>
+    <string name="error_rounds_not_number">Make \"Transformation rounds\" a number.</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>
-    <string name="error_title_required">A title is required.</string>
-    <string name="error_wrong_length">Enter a positive whole number in the \"Length\" field</string>
-    <string name="error_autofill_enable_service">Autofill service can\'t be enabled.</string>
-    <string name="error_move_folder_in_itself">Unable to move a group into itself.</string>
-    <string name="field_name">Field Name</string>
-    <string name="field_value">Field Value</string>
-    <string name="file_not_found">File not found.</string>
-    <string name="file_not_found_content">File not found. Try reopening from your content provider.</string>
-    <string name="file_browser">File Browser</string>
-    <string name="generate_password">Generate Password</string>
+    <string name="error_title_required">Add a title.</string>
+    <string name="error_wrong_length">Enter a positive whole number in the \"Length\" field.</string>
+    <string name="error_autofill_enable_service">Could not enable autofill service.</string>
+    <string name="error_move_folder_in_itself">You can not move a group into itself.</string>
+    <string name="field_name">Field name</string>
+    <string name="field_value">Field value</string>
+    <string name="file_not_found">Could not find file.</string>
+    <string name="file_not_found_content">Could not find file. Try reopening it from your file browser.</string>
+    <string name="file_browser">File browser</string>
+    <string name="generate_password">Generate password</string>
     <string name="hint_conf_pass">confirm password</string>
     <string name="hint_generated_password">generated password</string>
     <string name="hint_group_name">Group name</string>
-    <string name="hint_keyfile">key file</string>
+    <string name="hint_keyfile">keyfile</string>
     <string name="hint_length">length</string>
     <string name="hint_pass">password</string>
     <string name="password">Password</string>
-    <string name="install_from_play_store">Install from Play Store</string>
     <string name="install_from_f_droid">Install from F-Droid</string>
-    <string name="InvalidPassword">Invalid password or key file.</string>
-    <string name="invalid_algorithm">Invalid algorithm.</string>
-    <string name="invalid_db_sig">Database format not recognized.</string>
+    <string name="install_from_play_store">Install from Play Store</string>
+    <string name="invalid_password">Could not read password or keyfile.</string>
+    <string name="invalid_algorithm">Wrong algorithm.</string>
+    <string name="invalid_db_sig">Could not recognize the database format.</string>
     <string name="keyfile_does_not_exist">No keyfile exists.</string>
     <string name="keyfile_is_empty">The keyfile is empty.</string>
     <string name="length">Length</string>
-    <string name="list_entries_show_username_title">Display usernames</string>
-    <string name="list_entries_show_username_summary">Display usernames in entry lists</string>
+    <string name="list_entries_show_username_title">Show usernames</string>
+    <string name="list_entries_show_username_summary">Show usernames in entry lists</string>
     <string name="list_size_title">Size of list items</string>
     <string name="list_size_summary">Text size in the element list</string>
     <string name="loading_database">Loading database…</string>
     <string name="lowercase">Lower-case</string>
-    <string name="maskpass_title">Mask password</string>
-    <string name="maskpass_summary">Hide passwords by default</string>
+    <string name="maskpass_title">Hide passwords</string>
+    <string name="maskpass_summary">Mask passwords (***) by default</string>
     <string name="menu_about">About</string>
-    <string name="menu_change_key">Change Master Key</string>
+    <string name="menu_change_key">Change master key</string>
     <string name="copy_field">Copy of %1$s</string>
     <string name="settings">Settings</string>
     <string name="menu_app_settings">App settings</string>
@@ -132,41 +133,42 @@
     <string name="menu_paste">Paste</string>
     <string name="menu_delete">Delete</string>
     <string name="menu_cancel">Cancel</string>
-    <string name="menu_hide_password">Hide Pass</string>
-    <string name="menu_lock">Lock Database</string>
+    <string name="menu_hide_password">Hide password</string>
+    <string name="menu_lock">Lock database</string>
     <string name="menu_open">Open</string>
     <string name="menu_search">Search</string>
-    <string name="menu_showpass">Show pass</string>
-    <string name="menu_fingerprint_remove_key">Remove the fingerprint key</string>
+    <string name="menu_showpass">Show password</string>
+    <string name="menu_fingerprint_remove_key">Delete saved fingerprint</string>
     <string name="menu_url">Go to URL</string>
-    <string name="menu_file_selection_read_only">Read only</string>
-    <string name="menu_open_file_read_and_write">Read and write</string>
+    <string name="menu_file_selection_read_only">Write-protected</string>
+    <string name="menu_open_file_read_and_write">Modifiable</string>
     <string name="minus">Minus</string>
     <string name="never">Never</string>
     <string name="no_results">No search results</string>
-    <string name="no_url_handler">No handler for this URL.</string>
-    <string name="select_database_file">Select an existing database</string>
+    <string name="no_url_handler">Install a web browser to open this URL.</string>
+    <string name="select_database_file">Open existing database</string>
+    <string name="create_keepass_file">Create new database</string>
     <string name="open_recent">Recent databases:</string>
     <string name="omitbackup_title">Don\'t search through backup entries</string>
-    <string name="omitbackup_summary">Omit \'Backup\' group from search results (only applies to .kdb files)</string>
+    <string name="omitbackup_summary">Omits \"Backup\" group from search results (only applies to .kdb files)</string>
     <string name="progress_create">Creating new database…</string>
     <string name="progress_title">Working…</string>
     <string name="protection">Protection</string>
-    <string name="read_only">Read-only</string>
-    <string name="read_only_warning">KeePass DX does not have permission to write to your database location, so it will be opened read-only.</string>
+    <string name="read_only">Write-protected</string>
+    <string name="read_only_warning">KeePass DX needs write permission in order to change anything in your database.</string>
     <string name="read_only_kitkat_warning">Starting with Android KitKat, some devices no longer allow apps to write to the SD card.</string>
     <string name="recentfile_title">Recent file history</string>
-    <string name="recentfile_summary">Remember recently used file names</string>
-    <string name="remember_keyfile_summary">Remember the location of keyfiles</string>
+    <string name="recentfile_summary">Remember recent filenames</string>
+    <string name="remember_keyfile_summary">Remembers the location of app security keyfiles</string>
     <string name="remember_keyfile_title">Save keyfile</string>
     <string name="remove_from_filelist">Remove</string>
     <string name="root">Root</string>
-    <string name="encryption_explanation">Algorithm to encrypt the whole database. (Passwords, usernames, notes and all data in the database are encrypted with the selected algorithm)</string>
+    <string name="encryption_explanation">Database encryption algorithm used for passwords, usernames, notes and all data.</string>
     <string name="kdf_explanation">To generate the key for the encryption algorithm, the compressed master key (SHA-256) is transformed using a randomly salted key derivation function.</string>
-    <string name="rounds">Transform Rounds</string>
-    <string name="rounds_explanation">Higher encryption rounds provide additional protection against brute force attacks, but can really slow down loading and saving.</string>
-    <string name="rounds_hint">rounds</string>
-    <string name="memory_usage">Memory Usage</string>
+    <string name="rounds">Transformation rounds</string>
+    <string name="rounds_explanation">Additional encryption rounds provide higher protection against brute force attacks, but can really slow down loading and saving.</string>
+    <string name="rounds_hint">transformation rounds</string>
+    <string name="memory_usage">Memory usage</string>
     <string name="memory_usage_explanation">Amount of memory (in binary bytes) to be used by the key derivation function.</string>
     <string name="parallelism">Parallelism</string>
     <string name="parallelism_explanation">Degree of parallelism (i.e. number of threads) used by the key derivation function.</string>
@@ -177,116 +179,118 @@
     <string name="sort_ascending">Lowest first ↓</string>
     <string name="sort_groups_before">Groups before</string>
     <string name="sort_recycle_bin_bottom">Recycle bin at the bottom</string>
-    <string name="sort_db">DB sort order</string>
+    <string name="sort_db">Natural Database</string>
     <string name="sort_title">Title</string>
     <string name="sort_username">Username</string>
-    <string name="sort_creation_time">Creation Time</string>
-    <string name="sort_last_modify_time">Last Modification Time</string>
-    <string name="sort_last_access_time">Last Access Time</string>
+    <string name="sort_creation_time">Creation</string>
+    <string name="sort_last_modify_time">Modification</string>
+    <string name="sort_last_access_time">Access</string>
+    <!--As in special characters. Used for chars outside of Latin-1.-->
     <string name="special">Special</string>
     <string name="search">Search</string>
     <string name="search_results">Search results</string>
     <string name="underline">Underline</string>
     <string name="unsupported_db_version">Unsupported database version.</string>
     <string name="uppercase">Upper-case</string>
-    <string name="use_saf_summary">Use Android storage access (SAF) framework for file browsing (KitKat and later)</string>
-    <string name="use_saf_title">Storage Access Framework</string>
+    <string name="use_saf_summary">Use Android storage access (SAF) framework for file browsing (KitKat onwards)</string>
+    <string name="use_saf_title">Storage access framework</string>
     <string name="warning">Warning</string>
-    <string name="warning_password_encoding">Your password may contain letters not supported by the Latin-1 character set used by .kdb files. As these are all converted to the same letter, it is recommended to change your password to make it safer.</string>
-    <string name="warning_unmounted">Your SD card not currently mounted on your device. You will not be able to load or create your database.</string>
-    <string name="warning_empty_password">Do you really want to use an empty string as your password?</string>
-    <string name="warning_no_encryption_key">Are you sure you do not want to use any encryption key ?</string>
-    <string name="version_label">Version: %1$s</string>
-    <string name="build_label">Build: %1$s</string>
-    <string name="configure_fingerprint">The fingerprint is supported but not configured for this device</string>
-    <string name="scanning_fingerprint">Listening for fingerprints</string>
+    <string name="warning_password_encoding">Avoid password characters outside of Latin-1 in .kbd files, as they are all converted to the same letter.</string>
+    <string name="warning_read_only">Grant SD card write access to save database changes.</string>
+    <string name="warning_unmounted">Mount the SD card to create or load a database.</string>
+    <string name="warning_empty_password">Do you really want no password unlocking protection?</string>
+    <string name="warning_no_encryption_key">Are you sure you do not want to use any encryption key?</string>
+    <string name="version_label">Version %1$s</string>
+    <string name="build_label">Build %1$s</string>
+    <string name="configure_fingerprint">Fingerprint scanning is supported but not set up.</string>
+    <string name="scanning_fingerprint">Fingerprint Scanning</string>
     <string name="encrypted_value_stored">Encrypted password stored</string>
-    <string name="fingerprint_invalid_key">Invalid fingerprint key problem. Restore your password.</string>
-    <string name="fingerprint_not_recognized">Fingerprint not recognized</string>
-    <string name="fingerprint_error">Fingerprint problem: %1$s</string>
+    <string name="fingerprint_invalid_key">Could not read fingerprint key. Restore your password.</string>
+    <string name="fingerprint_not_recognized">Could not recognize fingerprint</string>
+    <!--This problem could be with scanning, or something else.-->
+    <string name="fingerprint_error">Fingerprinting problem: %1$s</string>
     <string name="store_with_fingerprint">Use fingerprint to store this password</string>
-    <string name="no_password_stored">No password stored for this database yet</string>
+    <string name="no_password_stored">This database does not have a password yet.</string>
     <string name="history">History</string>
     <string name="appearance">Appearance</string>
     <string name="general">General</string>
     <string name="autofill">Autofill</string>
-    <string name="autofill_service_name">KeePass DX Autofill Service</string>
+    <string name="autofill_service_name">KeePass DX form autofilling</string>
     <string name="autofill_sign_in_prompt">Sign in with KeePass DX</string>
-    <string name="set_autofill_service_title">Set default Autofill service</string>
-    <string name="set_autofill_service_summary">Enable the service to easily fill out forms from other apps</string>
-    <string name="password_size_title">Password size</string>
-    <string name="password_size_summary">Set the default size of the generated password</string>
+    <string name="set_autofill_service_title">Set default autofill service</string>
+    <string name="set_autofill_service_summary">Enable autofilling to quickly fill out forms in other apps</string>
+    <string name="password_size_title">Generated password size</string>
+    <string name="password_size_summary">Sets default size of the generated passwords</string>
     <string name="list_password_generator_options_title">Password characters</string>
-    <string name="list_password_generator_options_summary">Set the default password generator characters</string>
+    <string name="list_password_generator_options_summary">Set allowed password generator characters</string>
     <string name="clipboard">Clipboard</string>
-    <string name="clipboard_notifications_title">Clipboard Notifications</string>
+    <string name="clipboard_notifications_title">Clipboard notifications</string>
     <string name="clipboard_notifications_summary">Enable clipboard notifications to copy entry fields</string>
-    <string name="clipboard_warning">If your device is not able to delete clips from the clipboard automatically, delete the copied item from your clipboard history manually.</string>
+    <string name="clipboard_warning">If automatic deletion of clipboard fails, delete its history manually.</string>
     <string name="lock">Lock</string>
     <string name="lock_database_screen_off_title">Screen lock</string>
     <string name="lock_database_screen_off_summary">Lock the database when the screen is off</string>
-    <string name="fingerprint_quick_unlock_title">How to configure fingerprint for quick unlocking?</string>
-    <string name="fingerprint_setting_text">Set your personnal fingerprint for your device in </string>
+    <string name="fingerprint_quick_unlock_title">How to set up fingerprint scanning for quick unlocking?</string>
+    <string name="fingerprint_setting_text">Save your scanned fingerprint for your device in </string>
     <!-- Use ← for LTR languages -->
     <string name="fingerprint_setting_way_text">\"Settings\" → \"Security\" → \"Fingerprint\"</string>
-    <string name="fingerprint_type_password_text">Type your password in Keepass DX</string>
-    <string name="fingerprint_scan_to_store">Scan your fingerprint to store your master password securely</string>
-    <string name="fingerprint_scan_to_open">Scan your fingerprint when the password checkbox is unchecked to open the database</string>
+    <string name="fingerprint_type_password_text">Enter database lock password</string>
+    <string name="fingerprint_scan_to_store">Scan your fingerprint to store your database lock password securely.</string>
+    <string name="fingerprint_scan_to_open">Scan your fingerprint to open the database when password is turned off.</string>
     <string name="usage">Usage</string>
     <string name="fingerprint">Fingerprint</string>
-    <string name="fingerprint_enable_title">Scanning for fingerprints</string>
-    <string name="fingerprint_enable_summary">Enable database opening by fingerprint</string>
+    <string name="fingerprint_enable_title">Fingerprint scanning</string>
+    <string name="fingerprint_enable_summary">Lets you scan your fingerprint to open the database</string>
     <string name="fingerprint_delete_all_title">Delete encryption keys</string>
     <string name="fingerprint_delete_all_summary">Delete all encryption keys related to fingerprint recognition</string>
-    <string name="fingerprint_delete_all_warning">Are you sure you want to delete all the keys related to fingerprints?</string>
+    <string name="fingerprint_delete_all_warning">Are you sure you want to delete all keys related to fingerprint recognition?</string>
     <string name="unavailable_feature_text">Could not start this feature.</string>
     <string name="unavailable_feature_version">Your Android version %1$s does not meet the minimum version %2$s required.</string>
-    <string name="unavailable_feature_hardware">The hardware is not detected.</string>
+    <string name="unavailable_feature_hardware">Could not find the corresponding hardware.</string>
     <string name="file_name">Filename</string>
     <string name="path">Path</string>
     <string name="assign_master_key">Assign a master key</string>
-    <string name="create_keepass_file">Create a KeePass file</string>
     <string name="bytes">Bytes</string>
-    <string name="full_file_path_enable_title">File Path</string>
+    <string name="full_file_path_enable_title">File path</string>
     <string name="full_file_path_enable_summary">View the full file path</string>
-    <string name="recycle_bin_title">Use Recycle Bin</string>
-    <string name="recycle_bin_summary">Move a group or entry to the \"Recycle bin\" before deleting</string>
-    <string name="permission_external_storage_rationale_write_database">KeePass DX needs external storage permission to write a database</string>
-    <string name="permission_external_storage_rationale_read_database">KeePass DX needs external storage permission to read an URI not provided by a content provider</string>
-    <string name="permission_external_storage_denied">External storage permission denied</string>
-    <string name="permission_external_storage_never_ask">Can\'t perform the action without external storage permission</string>
-    <string name="monospace_font_fields_enable_title">Field Font</string>
-    <string name="monospace_font_fields_enable_summary">Change the font used in fields for better character visibility</string>
-    <string name="auto_open_file_uri_title">Auto open selected file</string>
-    <string name="auto_open_file_uri_summary">Open a file from the selection screen automatically after a selection is made in the file browser</string>
-    <string name="allow_copy_password_title">Copy of password</string>
-    <string name="allow_copy_password_summary">Allow the copy of the password and protected fields to the clipboard</string>
+    <string name="recycle_bin_title">Use recycle bin</string>
+    <string name="recycle_bin_summary">Moves groups and entries to \"Recycle bin\" before deleting</string>
+    <string name="permission_external_storage_rationale_write_database">KeePass DX needs external storage permission to write to a database.</string>
+    <string name="permission_external_storage_rationale_read_database">KeePass DX needs external storage permission to read an URI not provided by a content provider.</string>
+    <string name="permission_external_storage_denied">Could not get external storage permission.</string>
+    <string name="permission_external_storage_never_ask">Cannot perform the action without external storage permission.</string>
+    <string name="monospace_font_fields_enable_title">Field font</string>
+    <string name="monospace_font_fields_enable_summary">Change font used in fields for better character visibility</string>
+    <string name="auto_open_file_uri_title">Open files by selecting</string>
+    <string name="auto_open_file_uri_summary">Auto open files when selected in the file browser</string>
+    <string name="allow_copy_password_title">Clipboard trust</string>
+    <string name="allow_copy_password_summary">Allow the entry password and protected fields to enter the clipboard</string>
     <string name="allow_copy_password_warning">WARNING: The clipboard is shared by all apps. If sensitive data is copied, other software may recover it.</string>
-    <string name="warning_disabling_storage_access_framework">WARNING: Disabling this feature may result in an inability to open or save databases</string>
-    <string name="open_link_database">Link of the KDBX file to open</string>
+    <string name="warning_disabling_storage_access_framework">WARNING: Turning off this feature may prevent opening or saving databases.</string>
+    <string name="open_link_database">Link of database file to open</string>
     <string name="database_name_title">Database name</string>
     <string name="database_description_title">Database description</string>
     <string name="database_version_title">Database version</string>
-    <string name="text_appearance">Text appearance</string>
-    <string name="application_appearance">App appearance</string>
+    <string name="text_appearance">Text</string>
+    <string name="application_appearance">App</string>
     <string name="other">Other</string>
 
     <string name="keyboard">Keyboard</string>
     <string name="magic_keyboard_title">Magikeyboard</string>
-    <string name="magic_keyboard_summary">Activate a custom keyboard that populates your passwords and all your identity fields easily</string>
+    <string name="magic_keyboard_summary">Activate a custom keyboard populating your passwords and all identity fields</string>
     <string name="magic_keyboard_preference_title">Magikeyboard settings</string>
-    <string name="magic_keyboard_configure_title">How to configure the keyboard for secure form filling?</string>
-    <string name="magic_keyboard_activate_setting_text">Activate the Magikeyboard in the device settings.</string>
-    <!-- Use ← for LTR languages -->
+    <string name="magic_keyboard_configure_title">Set up the keyboard to autofill forms securely.</string>
+    <string name="magic_keyboard_activate_setting_text">Activate \"Magikeyboard\" in the device settings.</string>
+    <!--Use ← for LTR languages-->
     <string name="magic_keyboard_activate_setting_path_1_text">\"Settings\" → \"Language &amp; input\" → \"Current Keyboard\" and pick one.</string>
-    <!-- Use ← for LTR languages -->
-    <string name="magic_keyboard_activate_setting_path_2_text">or (\"Settings\" → \"Language &amp; input\" → \"Virtual keyboard\" and pick one.")</string>
+    <!--Use ← for LTR languages-->
+    <string name="magic_keyboard_activate_setting_path_2_text">or (\"Settings\" → \"Language &amp; input\" → \"Virtual keyboard\" and pick one.)</string>
     <string name="keyboards_choose_magikeyboard_text">Choose the Magikeyboard when you need to fill a form.</string>
-    <string name="keyboards_swicth_magikeyboard_text">You can easily switch from your main keyboard to Magikeyboard with the language button of your keyboard, a long press on the space bar of your keyboard, or, if it is not available, with : </string>
+    <string name="keyboards_swicth_magikeyboard_text">Switch keybaords by long pressing the spacebar of your keyboard, or, if it is not available, with: </string>
     <string name="keyboard_select_entry_text">Select your entry with the key.</string>
-    <string name="keyboard_fill_field_text">Fill in your fields using the elements of the entry.</string>
+    <string name="keyboard_fill_field_text">Fill in your fields using the entry elements.</string>
     <string name="keyboard_lock_database_text">Lock the database.</string>
-    <string name="keyboard_back_main_keyboard_text">Go back to your main keyboard.</string>
+    <string name="keyboard_back_main_keyboard_text">Use default keyboard again.</string>
 
     <string name="keyboard_name">Magikeyboard</string>
     <string name="keyboard_label">Magikeyboard (KeePass DX)</string>
@@ -327,50 +331,51 @@
     <bool name="keyboard_key_sound_default" translatable="false">false</bool>
 
     <string name="allow_no_password_title">Allow no password</string>
-    <string name="allow_no_password_summary">Enable the open button if no password identification is selected</string>
-    <string name="enable_read_only_title">Read only</string>
-    <string name="enable_read_only_summary">By default, open databases read-only</string>
+    <string name="allow_no_password_summary">Enable the \"Open"\ button if no password identification is selected</string>
+    <string name="enable_read_only_title">Write-protected</string>
+    <string name="enable_read_only_summary">Open your database read-only by default</string>
 
-    <string name="enable_education_screens_title">Education screens</string>
+    <string name="enable_education_screens_title">Educational screens</string>
     <string name="enable_education_screens_summary">Highlight the elements to learn how the app works</string>
-    <string name="reset_education_screens_title">Reset education screens</string>
-    <string name="reset_education_screens_summary">Reset the display of education items</string>
-    <string name="reset_education_screens_text">Education screens reset</string>
+    <string name="reset_education_screens_title">Reset educational screens</string>
+    <string name="reset_education_screens_summary">Show all educational items again</string>
+    <string name="reset_education_screens_text">Educational screens reset</string>
     <string name="education_create_database_title">Create your database file</string>
-    <string name="education_create_database_summary">You don\'t know KeePass DX yet, create your first password management file.</string>
+    <string name="education_create_database_summary">Create your first password management file.</string>
     <string name="education_select_database_title">Open an existing database</string>
-    <string name="education_select_database_summary">You have already used a KeePass manager. Just open your KDBX file from your file browser.</string>
+    <string name="education_select_database_summary">Open your earlier database file from your file browser to continue using it.</string>
     <string name="education_open_link_database_title">A link to the location of your file is sufficient</string>
     <string name="education_open_link_database_summary">You can also open your database with a physical link (with file:// and content:// for example).</string>
-    <string name="education_new_node_title">Add new items to your base</string>
-    <string name="education_new_node_summary">Add entries to manage your digital identities.\n\nAdd groups (the equivalent of folders) to organize your entries and your database.</string>
-    <string name="education_search_title">Easily search your entries</string>
-    <string name="education_search_summary">Search for entries by title, username or other fields to easily retrieve your passwords.</string>
-    <string name="education_fingerprint_title">Unlock your database with your fingerprint</string>
-    <string name="education_fingerprint_summary">Make the link between your password and your fingerprint to easily unlock your database.</string>
+    <!--both entries and groups are items-->
+    <string name="education_new_node_title">Add items to your database</string>
+    <string name="education_new_node_summary">Entries help manage your digital identities.\n\nGroups (~ folders) organize entries in your database.</string>
+    <string name="education_search_title">Search through entries</string>
+    <string name="education_search_summary">Enter title, username or content of other fields to retrieve your passwords.</string>
+    <string name="education_fingerprint_title">Database unlocking by fingerprint</string>
+    <string name="education_fingerprint_summary">Link your password to your scanned fingerprint to quickly unlock your database.</string>
     <string name="education_entry_edit_title">Edit the entry</string>
-    <string name="education_entry_edit_summary">Edit your entry with custom fields, references to pool data can be added between fields of different entries.</string>
-    <string name="education_generate_password_title">Create a strong password</string>
-    <string name="education_generate_password_summary">Generate a strong password to associate with your entry, easily define it according to the criteria of the form and don\'t forget secure password you can remember.</string>
+    <string name="education_entry_edit_summary">Edit your entry with custom fields. Pool data can be referenced between different entry fields.</string>
+    <string name="education_generate_password_title">Create a strong password for your entry.</string>
+    <string name="education_generate_password_summary">Don\'t forget to add a title you remember your entry by.</string>
     <string name="education_entry_new_field_title">Add custom fields</string>
-    <string name="education_entry_new_field_summary">You want to register a basic non-supplied field, simply fill in a new one that you can also protect visually.</string>
+    <string name="education_entry_new_field_summary">Register a basic non-supplied field by filling in a new one that you can also protect.</string>
     <string name="education_unlock_title">Unlock your database</string>
-    <string name="education_unlock_summary">Enter a password and/or a key file to unlock your database.\n\nRemember to save a copy of your .kdbx file in a safe place after each modification.</string>
-    <string name="education_read_only_title">Enable read-only</string>
-    <string name="education_read_only_summary">Change the opening mode for the session.\n\nIn read-only mode, you prevent unintended changes to the database.\n\nIn write mode, you can add, delete, or modify all the elements as you want.</string>
+    <string name="education_unlock_summary">Enter the password and/or keyfile to unlock your database.\n\nBackup your database file in a safe place after each change.</string>
+    <string name="education_read_only_title">Write protect your database</string>
+    <string name="education_read_only_summary">Change opening mode for the session.\n\n\"Write-protected\" prevents unintended changes to the database.\n\"Modifiable\" lets you add, delete, or modify all elements.</string>
     <string name="education_field_copy_title">Copy a field</string>
-    <string name="education_field_copy_summary">Copy a field easily to paste it where you want\n\nYou can use several forms filling methods. Use the one you prefer.</string>
+    <string name="education_field_copy_summary">Copied fields can be pasted anywhere.\n\nUse the form filling method you prefer.</string>
     <string name="education_lock_title">Lock the database</string>
-    <string name="education_lock_summary">Lock your database quickly, you can set up the app to lock it after a while, and when the screen goes off.</string>
-    <string name="education_sort_title">Sort items</string>
-    <string name="education_sort_summary">Sort entries and groups according to specific parameters.</string>
+    <string name="education_lock_summary">Lock your database quickly, you can set up the app to lock it after a while, and when the screen turns off.</string>
+    <string name="education_sort_title">Item sorting</string>
+    <string name="education_sort_summary">Choose how entries and groups are sorted.</string>
     <string name="education_donation_title">Participate</string>
-    <string name="education_donation_summary">Participate to help increase the stability, security and in adding more features.</string>
+    <string name="education_donation_summary">Help increase the stability, security and in adding more features.</string>
 
-    <string name="html_text_ad_free">Unlike many password management apps, this one is &lt;strong&gt;ad-free&lt;/strong&gt;, &lt;strong&gt;copylefted libre software&lt;/strong&gt; and does not recover personal data on its servers, even in its free version.</string>
+    <string name="html_text_ad_free">Unlike many password management apps, this one is &lt;strong&gt;ad-free&lt;/strong&gt;, &lt;strong&gt;copylefted libre software&lt;/strong&gt; and does not collect personal data on its servers, no matter what version you use.</string>
     <string name="html_text_buy_pro">By buying the pro version, you will have access to this &lt;strong&gt;visual feature&lt;/strong&gt; and you will especially help &lt;strong&gt;the realization of community projects.&lt;/strong&gt;</string>
     <string name="html_text_feature_generosity">This &lt;strong&gt;visual feature&lt;/strong&gt; is available thanks to your generosity.</string>
-    <string name="html_text_donation">In order to keep our freedom and to be always active, we count on your &lt;strong&gt;contribution.&lt;/strong&gt;</string>
+    <string name="html_text_donation">In order to keep our freedom and to always be active, we count on your &lt;strong&gt;contribution.&lt;/strong&gt;</string>
 
     <string name="html_text_dev_feature">This feature is &lt;strong&gt;under development&lt;/strong&gt; and requires your &lt;strong&gt;contribution&lt;/strong&gt; to be available soon.</string>
     <string name="html_text_dev_feature_buy_pro">By buying the &lt;strong&gt;pro&lt;/strong&gt; version,</string>
@@ -378,7 +383,7 @@
     <string name="html_text_dev_feature_encourage">you\'re encouraging developers to create &lt;strong&gt;new features&lt;/strong&gt; and to &lt;strong&gt;fix bugs&lt;/strong&gt; according to your remarks.</string>
     <string name="html_text_dev_feature_thanks">Thanks a lot for your contribution.</string>
     <string name="html_text_dev_feature_work_hard">We are working hard to release this feature quickly.</string>
-    <string name="html_text_dev_feature_upgrade">Do not forget to keep your app up to date.</string>
+    <string name="html_text_dev_feature_upgrade">Do not forget to keep your app up to date by installing new versions.</string>
 
     <string name="download">Download</string>
     <string name="contribute">Contribute</string>
@@ -409,8 +414,8 @@
     	<item>Large</item>
     </string-array>
 
-    <string name="style_choose_title">Select a theme</string>
-    <string name="style_choose_summary">Change the app theme by changing the colors</string>
+    <string name="style_choose_title">App theme</string>
+    <string name="style_choose_summary">Theme used in the app</string>
     <string-array name="list_style_names">
         <item>Light</item>
         <item>Night</item>
@@ -419,7 +424,7 @@
         <item>Red Volcano</item>
         <item>Purple Pro</item>
     </string-array>
-    <string name="icon_pack_choose_title">Select an icon pack</string>
-    <string name="icon_pack_choose_summary">Change the icon pack of the app</string>
+    <string name="icon_pack_choose_title">Icon pack</string>
+    <string name="icon_pack_choose_summary">Icon pack used in the app</string>
 
 </resources>