From b6721b32e738bfc0d55f13ab6997ce15522d698b Mon Sep 17 00:00:00 2001
From: J-Jamet <jamet.jeremy@outlook.com>
Date: Wed, 29 Nov 2017 20:36:03 +0100
Subject: [PATCH] Password length in settings #3

---
 .../GeneratePasswordFragment.java             |  2 ++
 .../com/keepassdroid/settings/PrefsUtil.java  |  8 +++++-
 app/src/main/res/layout/generate_password.xml | 12 ++++----
 app/src/main/res/layout/password.xml          |  2 +-
 app/src/main/res/values-ca/strings.xml        |  2 +-
 app/src/main/res/values-cs/strings.xml        |  2 +-
 app/src/main/res/values-da/strings.xml        |  2 +-
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values-el/strings.xml        |  2 +-
 app/src/main/res/values-es/strings.xml        |  2 +-
 app/src/main/res/values-eu/strings.xml        |  2 +-
 app/src/main/res/values-fi/strings.xml        |  2 +-
 app/src/main/res/values-fr/strings.xml        | 11 +++++---
 app/src/main/res/values-hu/strings.xml        |  2 +-
 app/src/main/res/values-it/strings.xml        |  2 +-
 app/src/main/res/values-iw/strings.xml        |  2 +-
 app/src/main/res/values-ja/strings.xml        |  2 +-
 app/src/main/res/values-lt/strings.xml        |  2 +-
 app/src/main/res/values-lv/strings.xml        |  2 +-
 app/src/main/res/values-nl/strings.xml        |  2 +-
 app/src/main/res/values-nn/strings.xml        |  2 +-
 app/src/main/res/values-pl/strings.xml        |  2 +-
 app/src/main/res/values-pt-rBR/strings.xml    |  2 +-
 app/src/main/res/values-pt-rPT/strings.xml    |  2 +-
 app/src/main/res/values-ru/strings.xml        |  2 +-
 app/src/main/res/values-sk/strings.xml        |  2 +-
 app/src/main/res/values-sv/strings.xml        |  2 +-
 app/src/main/res/values-uk/strings.xml        |  2 +-
 app/src/main/res/values-zh-rCN/strings.xml    |  2 +-
 app/src/main/res/values-zh-rTW/strings.xml    |  2 +-
 app/src/main/res/values/donottranslate.xml    |  7 +++--
 app/src/main/res/values/strings.xml           |  4 ++-
 app/src/main/res/xml/app_preferences.xml      | 28 ++++++++++++++-----
 33 files changed, 78 insertions(+), 46 deletions(-)

diff --git a/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java b/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java
index 1d59cdea4..cc09b01a0 100644
--- a/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java
+++ b/app/src/main/java/com/keepassdroid/GeneratePasswordFragment.java
@@ -35,6 +35,7 @@ import android.widget.EditText;
 import android.widget.SeekBar;
 import android.widget.Toast;
 
+import com.keepassdroid.settings.PrefsUtil;
 import com.kunzisoft.keepass.R;
 import com.keepassdroid.password.PasswordGenerator;
 
@@ -79,6 +80,7 @@ public class GeneratePasswordFragment extends DialogFragment {
             @Override
             public void onStopTrackingTouch(SeekBar seekBar) {}
         });
+        seekBar.setProgress(PrefsUtil.getDefaultPasswordLength(getContext().getApplicationContext()));
 
         Button genPassButton = (Button) root.findViewById(R.id.generate_password_button);
         genPassButton.setOnClickListener(new OnClickListener() {
diff --git a/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java b/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java
index 5c49f964a..9812153d6 100644
--- a/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java
+++ b/app/src/main/java/com/keepassdroid/settings/PrefsUtil.java
@@ -26,9 +26,15 @@ import android.preference.PreferenceManager;
 import com.kunzisoft.keepass.R;
 
 public class PrefsUtil {
+
 	public static float getListTextSize(Context ctx) {
 		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
 		return Float.parseFloat(prefs.getString(ctx.getString(R.string.list_size_key), ctx.getString(R.string.list_size_default)));
-
 	}
+
+    public static int getDefaultPasswordLength(Context ctx) {
+        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ctx);
+        return prefs.getInt(ctx.getString(R.string.password_length_key),
+                        Integer.parseInt(ctx.getString(R.string.default_password_length)));
+    }
 }
diff --git a/app/src/main/res/layout/generate_password.xml b/app/src/main/res/layout/generate_password.xml
index 58062ba61..0d2b36c44 100644
--- a/app/src/main/res/layout/generate_password.xml
+++ b/app/src/main/res/layout/generate_password.xml
@@ -20,6 +20,7 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -35,7 +36,8 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:maxLines="3"
-            android:hint="@string/hint_generated_password" />
+            android:hint="@string/hint_generated_password"
+            tools:ignore="TextFields" />
 
         <Button android:id="@+id/generate_password_button"
             android:layout_margin="@dimen/button_margin"
@@ -71,7 +73,7 @@
                     android:maxLines="1"
                     android:maxLength="3"
                     android:inputType="number"
-                    android:text="@integer/default_password_length"
+                    android:text="@string/default_password_length"
                     android:hint="@string/hint_length"/>
 
                 <android.support.v7.widget.AppCompatSeekBar android:id="@+id/seekbar_length"
@@ -83,9 +85,9 @@
                     android:layout_alignTop="@+id/length"
                     android:layout_toEndOf="@+id/length"
                     android:layout_toRightOf="@+id/length"
-                    app:min="1"
-                    android:progress="@integer/default_password_length"
-                    android:max="64"/>
+                    app:min="@string/min_password_length"
+                    android:progress="@string/default_password_length"
+                    android:max="@string/max_password_length"/>
 
             </RelativeLayout>
 
diff --git a/app/src/main/res/layout/password.xml b/app/src/main/res/layout/password.xml
index df1765046..71bf5a64f 100644
--- a/app/src/main/res/layout/password.xml
+++ b/app/src/main/res/layout/password.xml
@@ -120,7 +120,7 @@
                         android:id="@+id/password"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:hint="@string/hint_login_pass"
+                        android:hint="@string/password"
                         android:inputType="textPassword"
                         android:maxLines="1"/>
                 </android.support.design.widget.TextInputLayout>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 86b215aa7..319c3cf87 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -99,7 +99,7 @@
     <string name="hint_keyfile">arxiu clau</string>
     <string name="hint_length">longitud</string>
     <string name="hint_pass">contrasenya</string>
-    <string name="hint_login_pass">Contrasenya</string>
+    <string name="password">Contrasenya</string>
     <string name="hint_title">nom</string>
     <string name="hint_url">url</string>
     <string name="hint_username">usuari</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index c90301271..50d4c9e8d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -108,7 +108,7 @@
     <string name="hint_keyfile">klíčový soubor</string>
     <string name="hint_length">délka</string>
     <string name="hint_pass">heslo</string>
-    <string name="hint_login_pass">Heslo</string>
+    <string name="password">Heslo</string>
     <string name="hint_title">název</string>
     <string name="hint_url">url</string>
     <string name="hint_username">uživatelské jméno</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 5683d3bee..22be9b8a7 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -107,7 +107,7 @@
     <string name="hint_keyfile">nøglefil</string>
     <string name="hint_length">længde</string>
     <string name="hint_pass">adgangskode</string>
-    <string name="hint_login_pass">Adgangskode</string>
+    <string name="password">Adgangskode</string>
     <string name="hint_title">navn</string>
     <string name="hint_url">url</string>
     <string name="hint_username">brugernavn</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 51acc98e6..3f33debc3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -112,7 +112,7 @@
     <string name="hint_keyfile">Schlüsseldatei</string>
     <string name="hint_length">Länge</string>
     <string name="hint_pass">Passwort</string>
-    <string name="hint_login_pass">Passwort</string>
+    <string name="password">Passwort</string>
     <string name="hint_title">Name</string>
     <string name="hint_url">URL-Adresse</string>
     <string name="hint_username">Benutzername</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index ffeb9ed0d..db69cc70b 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -105,7 +105,7 @@
     <string name="hint_keyfile">αρχείο κλειδιού</string>
     <string name="hint_length">μήκος</string>
     <string name="hint_pass">κωδικός</string>
-    <string name="hint_login_pass">Κωδικός Πρόσβασης</string>
+    <string name="password">Κωδικός Πρόσβασης</string>
     <string name="hint_title">όνομα</string>
     <string name="hint_url">διεύθυνση url</string>
     <string name="hint_username">όνομα χρήστη</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 40a0fbd22..4bc329663 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -97,7 +97,7 @@ Spanish translation by José I. Paños. Updated by David García-Abad (23-09-201
     <string name="hint_group_name">Nombre de grupo</string>
     <string name="hint_keyfile">archivo clave</string>
     <string name="hint_length">longitud</string>
-    <string name="hint_login_pass">Contraseña</string>
+    <string name="password">Contraseña</string>
     <string name="hint_pass">contraseña</string>
     <string name="hint_title">nombre</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index 9a082c04c..9386fa679 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -107,7 +107,7 @@
     <string name="hint_keyfile">gako fitxategia</string>
     <string name="hint_length">luzera</string>
     <string name="hint_pass">pasahitza</string>
-    <string name="hint_login_pass">Pasahitza</string>
+    <string name="password">Pasahitza</string>
     <string name="hint_title">izena</string>
     <string name="hint_url">url</string>
     <string name="hint_username">erabiltzaile izena</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 8e612dc32..2949d9b10 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -105,7 +105,7 @@
     <string name="hint_keyfile">avaintiedosto</string>
     <string name="hint_length">pituus</string>
     <string name="hint_pass">salasana</string>
-    <string name="hint_login_pass">Salasana</string>
+    <string name="password">Salasana</string>
     <string name="hint_title">nimi</string>
     <string name="hint_url">url-osoite</string>
     <string name="hint_username">käyttäjänimi</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a42e1a8e6..67cfcef2b 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -109,7 +109,7 @@
     <string name="hint_keyfile">clé de fichier</string>
     <string name="hint_length">longueur</string>
     <string name="hint_pass">mot de passe</string>
-    <string name="hint_login_pass">Mot de passe</string>
+    <string name="password">Mot de passe</string>
     <string name="hint_title">nom</string>
     <string name="hint_url">URL</string>
     <string name="hint_username">nom d\'utilisateur</string>
@@ -199,6 +199,11 @@
     <string name="fingerprint_error">Problème d\'empreinte digitale</string>
     <string name="store_with_fingerprint">Utiliser l\'empreinte digitale pour stocker le mot de passe</string>
     <string name="no_password_stored">Pas de mot de passe encore stocké pour cette base de données</string>
+    <string name="history">Historique</string>
+    <string name="appearance">Apparence</string>
+    <string name="general">Générale</string>
+    <string name="password_size_title">Taille des mots de passe</string>
+    <string name="password_size_summary">Déterminer la taille par défaut des mots de passe lors de leurs générations</string>
 
     <string-array name="clipboard_timeout_options">
     	<item>30 secondes</item>
@@ -218,7 +223,5 @@
         <item>Light Theme</item>
         <item>Night Theme</item>
     </string-array>
-    <string name="history">Historique</string>
-    <string name="appearance">Apparence</string>
-    <string name="general">Générale</string>
+
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2a8e2146e..8a015a0be 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -86,7 +86,7 @@
     <string name="hint_keyfile">kulcsfájl</string>
     <string name="hint_length">hosszúság</string>
     <string name="hint_pass">jelszó</string>
-    <string name="hint_login_pass">Jelszó</string>
+    <string name="password">Jelszó</string>
     <string name="hint_title">név</string>
     <string name="hint_url">url</string>
     <string name="hint_username">felhasználónév</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 0e89a11b1..1d8ffae12 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -98,7 +98,7 @@
     <string name="hint_group_name">Nome gruppo</string>
     <string name="hint_keyfile">file chiave</string>
     <string name="hint_length">lunghezza</string>
-    <string name="hint_login_pass">Password</string>
+    <string name="password">Password</string>
     <string name="hint_pass">password</string>
     <string name="hint_title">nome</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index fa657544d..2c09170c3 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -103,7 +103,7 @@
   <string name="hint_keyfile">קובץ המפתח</string>
   <string name="hint_length">אורך</string>
   <string name="hint_pass">סיסמה</string>
-  <string name="hint_login_pass">סיסמה</string>
+  <string name="password">סיסמה</string>
   <string name="hint_title">שם</string>
   <string name="hint_username">שם משתמש</string>
   <string name="install_from_market">התקן מחנות Play</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e22bf93c5..f7e0ccc80 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -95,7 +95,7 @@
     <string name="hint_group_name">グループ名</string>
     <string name="hint_keyfile">キーファイル</string>
     <string name="hint_length">長さ</string>
-    <string name="hint_login_pass">パスワード</string>
+    <string name="password">パスワード</string>
     <string name="hint_pass">パスワード</string>
     <string name="hint_title">タイトル</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ccdff5a9a..dc358e943 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -44,7 +44,7 @@
     <string name="hint_group_name">Grupės pavadinimas</string>
     <string name="hint_keyfile">rakto failas</string>
     <string name="hint_length">ilgis</string>
-    <string name="hint_login_pass">Slaptažodis</string>
+    <string name="password">Slaptažodis</string>
     <string name="hint_pass">slaptažodis</string>
     <string name="hint_title">pavadinimas</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 69e69b31b..71cfd6fdb 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -86,7 +86,7 @@
     <string name="hint_keyfile">atslēgas fails</string>
     <string name="hint_length">garums</string>
     <string name="hint_pass">parole</string>
-    <string name="hint_login_pass">Parole</string>
+    <string name="password">Parole</string>
     <string name="hint_title">vārds</string>
     <string name="hint_url">url</string>
     <string name="hint_username">lietotājvārds</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index d24f0e17a..3ffcc311b 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -97,7 +97,7 @@
     <string name="hint_group_name">Groepnaam</string>
     <string name="hint_keyfile">sleutelbestand</string>
     <string name="hint_length">lengte</string>
-    <string name="hint_login_pass">Wachtwoord</string>
+    <string name="password">Wachtwoord</string>
     <string name="hint_pass">wachtwoord</string>
     <string name="hint_title">naam</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index 1f5b43b22..e9aef446f 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -95,7 +95,7 @@
     <string name="hint_group_name">Gruppenamn</string>
     <string name="hint_keyfile">nøkkelfil</string>
     <string name="hint_length">lengd</string>
-    <string name="hint_login_pass">Passord</string>
+    <string name="password">Passord</string>
     <string name="hint_pass">passord</string>
     <string name="hint_title">namn</string>
     <string name="hint_url">adresse</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 7be2582f9..755c0efff 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -93,7 +93,7 @@ along with KeePass DX. If not, see <http://www.gnu.org/licenses/>.
     <string name="hint_group_name">Nazwa grupy</string>
     <string name="hint_keyfile">plik klucza</string>
     <string name="hint_length">długość</string>
-    <string name="hint_login_pass">Hasło</string>
+    <string name="password">Hasło</string>
     <string name="hint_pass">hasło</string>
     <string name="hint_title">nazwa</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c2a12e4ec..399a22002 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -98,7 +98,7 @@
     <string name="hint_group_name">Nome do Grupo</string>
     <string name="hint_keyfile">arquivo de chave</string>
     <string name="hint_length">tamanho</string>
-    <string name="hint_login_pass">Senha</string>
+    <string name="password">Senha</string>
     <string name="hint_pass">senha</string>
     <string name="hint_title">nome</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index c9d42e8b9..cce44c5cc 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -109,7 +109,7 @@
     <string name="hint_keyfile">ficheiro chave</string>
     <string name="hint_length">comprimento</string>
     <string name="hint_pass">palavra-passe</string>
-    <string name="hint_login_pass">Palavra-passe</string>
+    <string name="password">Palavra-passe</string>
     <string name="hint_title">nome</string>
     <string name="hint_url">url</string>
     <string name="hint_username">nome de utilizador</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 4f90e369b..ab478b88f 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -108,7 +108,7 @@
     <string name="hint_keyfile">файл-ключ</string>
     <string name="hint_length">длина</string>
     <string name="hint_pass">пароль</string>
-    <string name="hint_login_pass">пароль</string>
+    <string name="password">пароль</string>
     <string name="hint_title">название</string>
     <string name="hint_url">ссылка</string>
     <string name="hint_username">логин</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 9a5e03c3a..1bbda85ff 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -95,7 +95,7 @@
     <string name="hint_group_name">Názov Skupiny</string>
     <string name="hint_keyfile">súbor keyfile</string>
     <string name="hint_length">dĺžka</string>
-    <string name="hint_login_pass">Heslo</string>
+    <string name="password">Heslo</string>
     <string name="hint_pass">heslo</string>
     <string name="hint_title">meno</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 8280b4edc..73e746839 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -106,7 +106,7 @@
     <string name="hint_keyfile">nyckelfil</string>
     <string name="hint_length">längd</string>
     <string name="hint_pass">lösenord</string>
-    <string name="hint_login_pass">Lösenord</string>
+    <string name="password">Lösenord</string>
     <string name="hint_title">namn</string>
     <string name="hint_url">url</string>
     <string name="hint_username">användarnamn</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 001efcadb..0ab49420b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -95,7 +95,7 @@
     <string name="hint_group_name">Ім’я групи</string>
     <string name="hint_keyfile">файл-ключ</string>
     <string name="hint_length">довжина</string>
-    <string name="hint_login_pass">Пароль</string>
+    <string name="password">Пароль</string>
     <string name="hint_pass">пароль</string>
     <string name="hint_title">ім’я</string>
     <string name="hint_url">url</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 2f6b71dd4..9313adc45 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -95,7 +95,7 @@
     <string name="hint_group_name">群组名</string>
     <string name="hint_keyfile">密钥文件</string>
     <string name="hint_length">长度</string>
-    <string name="hint_login_pass">密码</string>
+    <string name="password">密码</string>
     <string name="hint_pass">密码</string>
     <string name="hint_title">名称</string>
     <string name="hint_url">网址</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index ebe163679..b8aaca938 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -95,7 +95,7 @@
     <string name="hint_group_name">群組名</string>
     <string name="hint_keyfile">密鑰文件</string>
     <string name="hint_length">長度</string>
-    <string name="hint_login_pass">密碼</string>
+    <string name="password">密碼</string>
     <string name="hint_pass">密碼</string>
     <string name="hint_title">名稱</string>
     <string name="hint_url">網址</string>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 99b937cc5..646e00f25 100644
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -29,8 +29,11 @@
     <string name="oi_filemanager_web" translatable="false">https://openintents.googlecode.com/files/FileManager-2.0.2.apk</string>
     
     <!--  Password generator -->
-    <integer name="default_password_length" translatable="false">8</integer>
-    
+    <string name="password_length_key" translatable="false">password_length_key</string>
+    <string name="min_password_length" translatable="false">1</string>
+    <string name="default_password_length" translatable="false">14</string>
+    <string name="max_password_length" translatable="false">64</string>
+
     <!--  Preference settings -->
     <string name="algorithm_key" translatable="false">algorithm</string>
     <string name="app_key" translatable="false">app</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6a0e6462a..419979efa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,7 +108,7 @@
     <string name="hint_keyfile">key file</string>
     <string name="hint_length">length</string>
     <string name="hint_pass">password</string>
-    <string name="hint_login_pass">Password</string>
+    <string name="password">Password</string>
     <string name="hint_title">name</string>
     <string name="hint_url">url</string>
     <string name="hint_username">username</string>
@@ -202,6 +202,8 @@
     <string name="history">History</string>
     <string name="appearance">Appearance</string>
     <string name="general">General</string>
+    <string name="password_size_title">Passwords size</string>
+    <string name="password_size_summary">Set the default size of passwords during their generations</string>
 
     <string-array name="clipboard_timeout_options">
     	<item>30 seconds</item>
diff --git a/app/src/main/res/xml/app_preferences.xml b/app/src/main/res/xml/app_preferences.xml
index e641a8e75..e58c7ddf4 100644
--- a/app/src/main/res/xml/app_preferences.xml
+++ b/app/src/main/res/xml/app_preferences.xml
@@ -17,8 +17,8 @@
   You should have received a copy of the GNU General Public License
   along with KeePass DX.  If not, see <http://www.gnu.org/licenses/>.
 -->
-<PreferenceScreen
-	xmlns:android="http://schemas.android.com/apk/res/android">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
 	<PreferenceCategory
 		android:title="@string/general">
@@ -39,11 +39,6 @@
             android:entryValues="@array/clipboard_timeout_values"
             android:dialogTitle="@string/app_timeout"
             android:defaultValue="@string/clipboard_timeout_default"/>
-        <CheckBoxPreference
-            android:key="@string/maskpass_key"
-            android:title="@string/maskpass_title"
-            android:summary="@string/maskpass_summary"
-            android:defaultValue="@bool/maskpass_default"/>
         <CheckBoxPreference
             android:summary="@string/omitbackup_summary"
             android:defaultValue="@bool/omitbackup_default"
@@ -57,6 +52,25 @@
 
     </PreferenceCategory>
 
+    <PreferenceCategory
+        android:title="@string/password">
+
+        <SeekBarPreference
+            android:key="@string/password_length_key"
+            android:title="@string/password_size_title"
+            android:summary="@string/password_size_summary"
+            android:defaultValue="@string/default_password_length"
+            app:min="@string/min_password_length"
+            android:max="@string/max_password_length" />
+
+        <CheckBoxPreference
+            android:key="@string/maskpass_key"
+            android:title="@string/maskpass_title"
+            android:summary="@string/maskpass_summary"
+            android:defaultValue="@bool/maskpass_default"/>
+
+    </PreferenceCategory>
+
     <PreferenceCategory
         android:title="@string/history">