diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.java
index ba5efe0b0..bdd59ccad 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat.java
@@ -52,6 +52,8 @@ public class DatabaseEncryptionAlgorithmPreferenceDialogFragmentCompat extends D
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
+        setExplanationText(R.string.encryption_explanation);
+
         RecyclerView recyclerView = view.findViewById(R.id.pref_dialog_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         ListRadioItemAdapter<PwEncryptionAlgorithm> encryptionAlgorithmAdapter = new ListRadioItemAdapter<>(getActivity());
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.java
index 4911c73f9..d2f349141 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/DatabaseKeyDerivationPreferenceDialogFragmentCompat.java
@@ -56,6 +56,8 @@ public class DatabaseKeyDerivationPreferenceDialogFragmentCompat extends Databas
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
+        setExplanationText(R.string.kdf_explanation);
+
         RecyclerView recyclerView = view.findViewById(R.id.pref_dialog_list);
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         ListRadioItemAdapter<KdfEngine> kdfAdapter = new ListRadioItemAdapter<>(getActivity());
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/InputPreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/InputPreferenceDialogFragmentCompat.java
index 0f81dd37b..7fb9444d6 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/InputPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/InputPreferenceDialogFragmentCompat.java
@@ -19,6 +19,7 @@
  */
 package com.kunzisoft.keepass.settings.preferenceDialogFragment;
 
+import android.support.annotation.StringRes;
 import android.support.v7.preference.PreferenceDialogFragmentCompat;
 import android.view.View;
 import android.widget.TextView;
@@ -53,4 +54,8 @@ public abstract class InputPreferenceDialogFragmentCompat extends PreferenceDial
                 textExplanationView.setVisibility(View.VISIBLE);
             }
     }
+
+    public void setExplanationText(@StringRes int explanationTextId) {
+        setExplanationText(getString(explanationTextId));
+    }
 }
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/MemoryUsagePreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/MemoryUsagePreferenceDialogFragmentCompat.java
index a1a3eadc8..2c2aee14e 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/MemoryUsagePreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/MemoryUsagePreferenceDialogFragmentCompat.java
@@ -46,6 +46,7 @@ public class MemoryUsagePreferenceDialogFragmentCompat extends InputDatabaseSave
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
+        setExplanationText(R.string.memory_usage_explanation);
         setInputText(database.getMemoryUsageAsString());
     }
 
diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/ParallelismPreferenceDialogFragmentCompat.java b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/ParallelismPreferenceDialogFragmentCompat.java
index 8885f65bd..29fb51033 100644
--- a/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/ParallelismPreferenceDialogFragmentCompat.java
+++ b/app/src/main/java/com/kunzisoft/keepass/settings/preferenceDialogFragment/ParallelismPreferenceDialogFragmentCompat.java
@@ -46,6 +46,7 @@ public class ParallelismPreferenceDialogFragmentCompat extends InputDatabaseSave
     protected void onBindDialogView(View view) {
         super.onBindDialogView(view);
 
+        setExplanationText(R.string.parallelism_explanation);
         setInputText(database.getParallelismAsString());
     }
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cbc178d55..264ca6465 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -74,7 +74,7 @@
     <string name="error_failed_to_launch_link">Échec lors de l\'ouverture du lien.</string>
     <string name="error_filename_required">Le nom de fichier est obligatoire.</string>
     <string name="error_file_not_create">Impossible de créer le fichier :</string>
-    <string name="error_invalid_db">Base de données invalide.</string>
+    <string name="error_invalid_db">Base de données invalide ou clé maitresse non reconnue.</string>
     <string name="error_invalid_path">Chemin invalide.</string>
     <string name="error_no_name">Le nom est obligatoire.</string>
     <string name="error_nokeyfile">Un fichier clé est requis.</string>
@@ -150,12 +150,18 @@
     <string name="remove_from_filelist">Effacer</string>
     <string name="encryption_rijndael">Rijndael (AES)</string>
     <string name="root">Racine</string>
+    <string name="encryption_explanation">Algorithme pour chiffrer toute la base de données. (Les mots de passe, noms d\'utilisateur, notes et toutes les données dans la base de données sont chiffrés avec l\'algorithme sélectionné)</string>
+    <string name="kdf_explanation">Afin de générer la clé pour l\'algorithme de chiffrement, la clé maîtresse compressée (SHA-256) est transformée en utilisant une fonction de dérivation de clé (avec un salage aléatoire).</string>
     <string name="rounds">Tours de transformation</string>
     <string name="rounds_explanation">Un niveau de chiffrement supérieur assure une protection supplémentaire contre les attaques de force brute, mais peut considérablement ralentir l\'ouverture et l\'enregistrement.</string>
     <string name="rounds_hint">niveaux</string>
     <string name="rounds_fix_title">Résolution de la base de données</string>
     <string name="rounds_fix">Clé de niveau de chiffrement avant corruption</string>
     <string name="rounds_fix_explanation">Si votre base de données a été corrompue, entrez le nombre de tours utilisés précédemment pour essayer d\'ouvrir votre base de données.</string>
+    <string name="memory_usage">Utilisation de la Mémoire</string>
+    <string name="memory_usage_explanation">Quantité de mémoire (en octets) à utiliser par la fonction de dérivation de clé.</string>
+    <string name="parallelism">Parallélisme</string>
+    <string name="parallelism_explanation">Degré de parallélisme (nombre de threads) utilisé par la fonction de dérivation de clé.</string>
     <string name="saving_database">Enregistrement de la base de données…</string>
     <string name="space">Espace</string>
     <string name="search_label">Rechercher</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 72f8b6495..8eda40e84 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -74,7 +74,7 @@
     <string name="error_failed_to_launch_link">Failed to launch link.</string>
     <string name="error_filename_required">A filename is required.</string>
     <string name="error_file_not_create">Could not create file:</string>
-    <string name="error_invalid_db">Invalid database.</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>
@@ -151,6 +151,8 @@
     <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="kdf_explanation">In order to generate the key for the encryption algorithm, the compressed master key (SHA-256) is transformed using a key derivation function (with a random salt).</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_fix_title">Fix of database</string>
@@ -158,9 +160,9 @@
     <string name="rounds_fix_explanation">If your database was corrupted, enter the number of rounds used previously to try to open your database.</string>
     <string name="rounds_hint">rounds</string>
     <string name="memory_usage">Memory Usage</string>
-    <string name="memory_usage_explanation">Memory Usage Explanation TODO</string> <!-- TODO -->
+    <string name="memory_usage_explanation">Amount of memory (in bytes) to be used by the key derivation function.</string>
     <string name="parallelism">Parallelism</string>
-    <string name="parallelism_explanation">Parallelism Explanation</string> <!-- TODO -->
+    <string name="parallelism_explanation">Degree of parallelism (i.e. number of threads) used by the key derivation function.</string>
     <string name="saving_database">Saving database&#8230;</string>
     <string name="space">Space</string>
     <string name="search_label">Search</string>