From 129c07f9d964f1699d6332f66ff5c6d3c12aa1da Mon Sep 17 00:00:00 2001
From: Jakob Nixdorf <flocke@shadowice.org>
Date: Fri, 25 Sep 2020 07:47:52 +0200
Subject: [PATCH] Remove language region

Fixes #567
---
 .../andotp/Activities/MainActivity.java       |  2 +-
 .../andotp/Activities/SettingsActivity.java   |  2 +-
 .../flocke/andotp/Utilities/Settings.java     | 14 ++---
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 .../strings_about.xml                         |  0
 .../strings_auth.xml                          |  0
 .../strings_backup.xml                        |  0
 .../strings_intro.xml                         |  0
 .../strings_main.xml                          |  0
 .../strings_settings.xml                      |  0
 app/src/main/res/values/settings.xml          | 54 +++++++++----------
 app/src/main/res/xml/preferences.xml          |  6 +--
 131 files changed, 38 insertions(+), 40 deletions(-)
 rename app/src/main/res/{values-ar-rSA => values-ar}/strings_about.xml (100%)
 rename app/src/main/res/{values-ar-rSA => values-ar}/strings_auth.xml (100%)
 rename app/src/main/res/{values-ar-rSA => values-ar}/strings_backup.xml (100%)
 rename app/src/main/res/{values-ar-rSA => values-ar}/strings_intro.xml (100%)
 rename app/src/main/res/{values-ar-rSA => values-ar}/strings_main.xml (100%)
 rename app/src/main/res/{values-ar-rSA => values-ar}/strings_settings.xml (100%)
 rename app/src/main/res/{values-bg-rBG => values-bg}/strings_about.xml (100%)
 rename app/src/main/res/{values-bg-rBG => values-bg}/strings_auth.xml (100%)
 rename app/src/main/res/{values-bg-rBG => values-bg}/strings_backup.xml (100%)
 rename app/src/main/res/{values-bg-rBG => values-bg}/strings_intro.xml (100%)
 rename app/src/main/res/{values-bg-rBG => values-bg}/strings_main.xml (100%)
 rename app/src/main/res/{values-bg-rBG => values-bg}/strings_settings.xml (100%)
 rename app/src/main/res/{values-ca-rES => values-ca}/strings_about.xml (100%)
 rename app/src/main/res/{values-ca-rES => values-ca}/strings_auth.xml (100%)
 rename app/src/main/res/{values-ca-rES => values-ca}/strings_backup.xml (100%)
 rename app/src/main/res/{values-ca-rES => values-ca}/strings_intro.xml (100%)
 rename app/src/main/res/{values-ca-rES => values-ca}/strings_main.xml (100%)
 rename app/src/main/res/{values-ca-rES => values-ca}/strings_settings.xml (100%)
 rename app/src/main/res/{values-cs-rCZ => values-cs}/strings_about.xml (100%)
 rename app/src/main/res/{values-cs-rCZ => values-cs}/strings_auth.xml (100%)
 rename app/src/main/res/{values-cs-rCZ => values-cs}/strings_backup.xml (100%)
 rename app/src/main/res/{values-cs-rCZ => values-cs}/strings_intro.xml (100%)
 rename app/src/main/res/{values-cs-rCZ => values-cs}/strings_main.xml (100%)
 rename app/src/main/res/{values-cs-rCZ => values-cs}/strings_settings.xml (100%)
 rename app/src/main/res/{values-de-rDE => values-de}/strings_about.xml (100%)
 rename app/src/main/res/{values-de-rDE => values-de}/strings_auth.xml (100%)
 rename app/src/main/res/{values-de-rDE => values-de}/strings_backup.xml (100%)
 rename app/src/main/res/{values-de-rDE => values-de}/strings_intro.xml (100%)
 rename app/src/main/res/{values-de-rDE => values-de}/strings_main.xml (100%)
 rename app/src/main/res/{values-de-rDE => values-de}/strings_settings.xml (100%)
 rename app/src/main/res/{values-el-rGR => values-el}/strings_about.xml (100%)
 rename app/src/main/res/{values-el-rGR => values-el}/strings_auth.xml (100%)
 rename app/src/main/res/{values-el-rGR => values-el}/strings_backup.xml (100%)
 rename app/src/main/res/{values-el-rGR => values-el}/strings_intro.xml (100%)
 rename app/src/main/res/{values-el-rGR => values-el}/strings_main.xml (100%)
 rename app/src/main/res/{values-el-rGR => values-el}/strings_settings.xml (100%)
 rename app/src/main/res/{values-es-rES => values-es}/strings_about.xml (100%)
 rename app/src/main/res/{values-es-rES => values-es}/strings_auth.xml (100%)
 rename app/src/main/res/{values-es-rES => values-es}/strings_backup.xml (100%)
 rename app/src/main/res/{values-es-rES => values-es}/strings_intro.xml (100%)
 rename app/src/main/res/{values-es-rES => values-es}/strings_main.xml (100%)
 rename app/src/main/res/{values-es-rES => values-es}/strings_settings.xml (100%)
 rename app/src/main/res/{values-fa-rIR => values-fa}/strings_about.xml (100%)
 rename app/src/main/res/{values-fa-rIR => values-fa}/strings_auth.xml (100%)
 rename app/src/main/res/{values-fa-rIR => values-fa}/strings_backup.xml (100%)
 rename app/src/main/res/{values-fa-rIR => values-fa}/strings_intro.xml (100%)
 rename app/src/main/res/{values-fa-rIR => values-fa}/strings_main.xml (100%)
 rename app/src/main/res/{values-fa-rIR => values-fa}/strings_settings.xml (100%)
 rename app/src/main/res/{values-fr-rFR => values-fr}/strings_about.xml (100%)
 rename app/src/main/res/{values-fr-rFR => values-fr}/strings_auth.xml (100%)
 rename app/src/main/res/{values-fr-rFR => values-fr}/strings_backup.xml (100%)
 rename app/src/main/res/{values-fr-rFR => values-fr}/strings_intro.xml (100%)
 rename app/src/main/res/{values-fr-rFR => values-fr}/strings_main.xml (100%)
 rename app/src/main/res/{values-fr-rFR => values-fr}/strings_settings.xml (100%)
 rename app/src/main/res/{values-gl-rES => values-gl}/strings_about.xml (100%)
 rename app/src/main/res/{values-gl-rES => values-gl}/strings_auth.xml (100%)
 rename app/src/main/res/{values-gl-rES => values-gl}/strings_backup.xml (100%)
 rename app/src/main/res/{values-gl-rES => values-gl}/strings_intro.xml (100%)
 rename app/src/main/res/{values-gl-rES => values-gl}/strings_main.xml (100%)
 rename app/src/main/res/{values-gl-rES => values-gl}/strings_settings.xml (100%)
 rename app/src/main/res/{values-hi-rIN => values-hi}/strings_about.xml (100%)
 rename app/src/main/res/{values-hi-rIN => values-hi}/strings_auth.xml (100%)
 rename app/src/main/res/{values-hi-rIN => values-hi}/strings_backup.xml (100%)
 rename app/src/main/res/{values-hi-rIN => values-hi}/strings_intro.xml (100%)
 rename app/src/main/res/{values-hi-rIN => values-hi}/strings_main.xml (100%)
 rename app/src/main/res/{values-hi-rIN => values-hi}/strings_settings.xml (100%)
 rename app/src/main/res/{values-hu-rHU => values-hu}/strings_about.xml (100%)
 rename app/src/main/res/{values-hu-rHU => values-hu}/strings_auth.xml (100%)
 rename app/src/main/res/{values-hu-rHU => values-hu}/strings_backup.xml (100%)
 rename app/src/main/res/{values-hu-rHU => values-hu}/strings_intro.xml (100%)
 rename app/src/main/res/{values-hu-rHU => values-hu}/strings_main.xml (100%)
 rename app/src/main/res/{values-hu-rHU => values-hu}/strings_settings.xml (100%)
 rename app/src/main/res/{values-it-rIT => values-it}/strings_about.xml (100%)
 rename app/src/main/res/{values-it-rIT => values-it}/strings_auth.xml (100%)
 rename app/src/main/res/{values-it-rIT => values-it}/strings_backup.xml (100%)
 rename app/src/main/res/{values-it-rIT => values-it}/strings_intro.xml (100%)
 rename app/src/main/res/{values-it-rIT => values-it}/strings_main.xml (100%)
 rename app/src/main/res/{values-it-rIT => values-it}/strings_settings.xml (100%)
 rename app/src/main/res/{values-ja-rJP => values-ja}/strings_about.xml (100%)
 rename app/src/main/res/{values-ja-rJP => values-ja}/strings_auth.xml (100%)
 rename app/src/main/res/{values-ja-rJP => values-ja}/strings_backup.xml (100%)
 rename app/src/main/res/{values-ja-rJP => values-ja}/strings_intro.xml (100%)
 rename app/src/main/res/{values-ja-rJP => values-ja}/strings_main.xml (100%)
 rename app/src/main/res/{values-ja-rJP => values-ja}/strings_settings.xml (100%)
 rename app/src/main/res/{values-nl-rNL => values-nl}/strings_about.xml (100%)
 rename app/src/main/res/{values-nl-rNL => values-nl}/strings_auth.xml (100%)
 rename app/src/main/res/{values-nl-rNL => values-nl}/strings_backup.xml (100%)
 rename app/src/main/res/{values-nl-rNL => values-nl}/strings_intro.xml (100%)
 rename app/src/main/res/{values-nl-rNL => values-nl}/strings_main.xml (100%)
 rename app/src/main/res/{values-nl-rNL => values-nl}/strings_settings.xml (100%)
 rename app/src/main/res/{values-pl-rPL => values-pl}/strings_about.xml (100%)
 rename app/src/main/res/{values-pl-rPL => values-pl}/strings_auth.xml (100%)
 rename app/src/main/res/{values-pl-rPL => values-pl}/strings_backup.xml (100%)
 rename app/src/main/res/{values-pl-rPL => values-pl}/strings_intro.xml (100%)
 rename app/src/main/res/{values-pl-rPL => values-pl}/strings_main.xml (100%)
 rename app/src/main/res/{values-pl-rPL => values-pl}/strings_settings.xml (100%)
 rename app/src/main/res/{values-ru-rRU => values-ru}/strings_about.xml (100%)
 rename app/src/main/res/{values-ru-rRU => values-ru}/strings_auth.xml (100%)
 rename app/src/main/res/{values-ru-rRU => values-ru}/strings_backup.xml (100%)
 rename app/src/main/res/{values-ru-rRU => values-ru}/strings_intro.xml (100%)
 rename app/src/main/res/{values-ru-rRU => values-ru}/strings_main.xml (100%)
 rename app/src/main/res/{values-ru-rRU => values-ru}/strings_settings.xml (100%)
 rename app/src/main/res/{values-sl-rSI => values-sl}/strings_about.xml (100%)
 rename app/src/main/res/{values-sl-rSI => values-sl}/strings_auth.xml (100%)
 rename app/src/main/res/{values-sl-rSI => values-sl}/strings_backup.xml (100%)
 rename app/src/main/res/{values-sl-rSI => values-sl}/strings_intro.xml (100%)
 rename app/src/main/res/{values-sl-rSI => values-sl}/strings_main.xml (100%)
 rename app/src/main/res/{values-sl-rSI => values-sl}/strings_settings.xml (100%)
 rename app/src/main/res/{values-sv-rSE => values-sv}/strings_about.xml (100%)
 rename app/src/main/res/{values-sv-rSE => values-sv}/strings_auth.xml (100%)
 rename app/src/main/res/{values-sv-rSE => values-sv}/strings_backup.xml (100%)
 rename app/src/main/res/{values-sv-rSE => values-sv}/strings_intro.xml (100%)
 rename app/src/main/res/{values-sv-rSE => values-sv}/strings_main.xml (100%)
 rename app/src/main/res/{values-sv-rSE => values-sv}/strings_settings.xml (100%)
 rename app/src/main/res/{values-tr-rTR => values-tr}/strings_about.xml (100%)
 rename app/src/main/res/{values-tr-rTR => values-tr}/strings_auth.xml (100%)
 rename app/src/main/res/{values-tr-rTR => values-tr}/strings_backup.xml (100%)
 rename app/src/main/res/{values-tr-rTR => values-tr}/strings_intro.xml (100%)
 rename app/src/main/res/{values-tr-rTR => values-tr}/strings_main.xml (100%)
 rename app/src/main/res/{values-tr-rTR => values-tr}/strings_settings.xml (100%)
 rename app/src/main/res/{values-uk-rUA => values-uk}/strings_about.xml (100%)
 rename app/src/main/res/{values-uk-rUA => values-uk}/strings_auth.xml (100%)
 rename app/src/main/res/{values-uk-rUA => values-uk}/strings_backup.xml (100%)
 rename app/src/main/res/{values-uk-rUA => values-uk}/strings_intro.xml (100%)
 rename app/src/main/res/{values-uk-rUA => values-uk}/strings_main.xml (100%)
 rename app/src/main/res/{values-uk-rUA => values-uk}/strings_settings.xml (100%)

diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
index d378860f..e4e96dd7 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/MainActivity.java
@@ -435,7 +435,7 @@ public class MainActivity extends BaseActivity
         } else if (key.equals(getString(R.string.settings_key_tap_single)) ||
                 key.equals(getString(R.string.settings_key_tap_double)) ||
                 key.equals(getString(R.string.settings_key_theme)) ||
-                key.equals(getString(R.string.settings_key_locale)) ||
+                key.equals(getString(R.string.settings_key_lang)) ||
                 key.equals(getString(R.string.settings_key_enable_screenshot)) ||
                 key.equals(getString(R.string.settings_key_tag_functionality)) ||
                 key.equals(getString(R.string.settings_key_label_highlight_token)) ||
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java b/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
index 6353906c..9ee85cfa 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Activities/SettingsActivity.java
@@ -146,7 +146,7 @@ public class SettingsActivity extends BaseActivity
         backupManager.dataChanged();
 
         if (key.equals(getString(R.string.settings_key_theme)) ||
-                key.equals(getString(R.string.settings_key_locale)) ||
+                key.equals(getString(R.string.settings_key_lang)) ||
                 key.equals(getString(R.string.settings_key_special_features)) ||
                 key.equals(getString(R.string.settings_key_backup_location))) {
             recreate();
diff --git a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
index 961666d9..e57ee557 100644
--- a/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
+++ b/app/src/main/java/org/shadowice/flocke/andotp/Utilities/Settings.java
@@ -48,8 +48,8 @@ import static org.shadowice.flocke.andotp.Utilities.Constants.EncryptionType;
 import static org.shadowice.flocke.andotp.Utilities.Constants.SortMode;
 
 public class Settings {
-    private static final List<String> oldLangs = Arrays.asList("system", "en", "cs", "de", "es", "fr", "gl", "nl", "pl", "ru", "zh");
-    private static final List<String> newLangs = Arrays.asList("system", "en_US", "cs_CZ", "de_DE", "es_ES", "fr_FR", "gl_ES", "nl_NL", "pl_PL", "ru_RU", "zh_CN");
+    private static final List<String> newLangs = Arrays.asList("ar",    "bg",    "ca",    "cs",    "de",    "el",    "en",    "es",    "fa",    "fr",    "gl",    "hi",    "hu",    "it",    "ja",    "nl",    "pl",    "pt_BR", "ru",    "sl",    "sv",    "tr",    "uk",    "zh_CN", "zh_TW");
+    private static final List<String> oldLangs = Arrays.asList("ar_SA", "bg_BG", "ca_ES", "cs_CZ", "de_DE", "el_GR", "en_US", "es_ES", "fa_IR", "fr_FR", "gl_ES", "hi_IN", "hu_HU", "it_IT", "ja_JP", "nl_NL", "pl_PL", "pt_BR", "ru_RU", "sl_SI", "sv_SE", "tr_TR", "uk_UA", "zh_CN", "zh_TW");
 
     private Context context;
     private SharedPreferences settings;
@@ -72,13 +72,13 @@ public class Settings {
             remove(R.string.settings_key_auth_pin);
         }
 
-        if (settings.contains(getResString(R.string.settings_key_lang))) {
-            String lang = getString(R.string.settings_key_lang, R.string.settings_default_locale);
+        if (settings.contains(getResString(R.string.settings_key_locale))) {
+            String lang = getString(R.string.settings_key_locale, R.string.settings_default_lang);
 
             if (oldLangs.contains(lang))
                 setLocale(newLangs.get(oldLangs.indexOf(lang)));
 
-            remove(R.string.settings_key_lang);
+            remove(R.string.settings_key_locale);
         }
 
         if (settings.contains(getResString(R.string.settings_key_tap_to_reveal))) {
@@ -320,11 +320,11 @@ public class Settings {
     }
 
     public void setLocale(String locale) {
-        setString(R.string.settings_key_locale, locale);
+        setString(R.string.settings_key_lang, locale);
     }
 
     public Locale getLocale() {
-        String lang = getString(R.string.settings_key_locale, R.string.settings_default_locale);
+        String lang = getString(R.string.settings_key_lang, R.string.settings_default_lang);
 
         if (lang.equals("system")) {
             return Tools.getSystemLocale();
diff --git a/app/src/main/res/values-ar-rSA/strings_about.xml b/app/src/main/res/values-ar/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/strings_about.xml
rename to app/src/main/res/values-ar/strings_about.xml
diff --git a/app/src/main/res/values-ar-rSA/strings_auth.xml b/app/src/main/res/values-ar/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/strings_auth.xml
rename to app/src/main/res/values-ar/strings_auth.xml
diff --git a/app/src/main/res/values-ar-rSA/strings_backup.xml b/app/src/main/res/values-ar/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/strings_backup.xml
rename to app/src/main/res/values-ar/strings_backup.xml
diff --git a/app/src/main/res/values-ar-rSA/strings_intro.xml b/app/src/main/res/values-ar/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/strings_intro.xml
rename to app/src/main/res/values-ar/strings_intro.xml
diff --git a/app/src/main/res/values-ar-rSA/strings_main.xml b/app/src/main/res/values-ar/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/strings_main.xml
rename to app/src/main/res/values-ar/strings_main.xml
diff --git a/app/src/main/res/values-ar-rSA/strings_settings.xml b/app/src/main/res/values-ar/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-ar-rSA/strings_settings.xml
rename to app/src/main/res/values-ar/strings_settings.xml
diff --git a/app/src/main/res/values-bg-rBG/strings_about.xml b/app/src/main/res/values-bg/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/strings_about.xml
rename to app/src/main/res/values-bg/strings_about.xml
diff --git a/app/src/main/res/values-bg-rBG/strings_auth.xml b/app/src/main/res/values-bg/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/strings_auth.xml
rename to app/src/main/res/values-bg/strings_auth.xml
diff --git a/app/src/main/res/values-bg-rBG/strings_backup.xml b/app/src/main/res/values-bg/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/strings_backup.xml
rename to app/src/main/res/values-bg/strings_backup.xml
diff --git a/app/src/main/res/values-bg-rBG/strings_intro.xml b/app/src/main/res/values-bg/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/strings_intro.xml
rename to app/src/main/res/values-bg/strings_intro.xml
diff --git a/app/src/main/res/values-bg-rBG/strings_main.xml b/app/src/main/res/values-bg/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/strings_main.xml
rename to app/src/main/res/values-bg/strings_main.xml
diff --git a/app/src/main/res/values-bg-rBG/strings_settings.xml b/app/src/main/res/values-bg/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-bg-rBG/strings_settings.xml
rename to app/src/main/res/values-bg/strings_settings.xml
diff --git a/app/src/main/res/values-ca-rES/strings_about.xml b/app/src/main/res/values-ca/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-ca-rES/strings_about.xml
rename to app/src/main/res/values-ca/strings_about.xml
diff --git a/app/src/main/res/values-ca-rES/strings_auth.xml b/app/src/main/res/values-ca/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-ca-rES/strings_auth.xml
rename to app/src/main/res/values-ca/strings_auth.xml
diff --git a/app/src/main/res/values-ca-rES/strings_backup.xml b/app/src/main/res/values-ca/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-ca-rES/strings_backup.xml
rename to app/src/main/res/values-ca/strings_backup.xml
diff --git a/app/src/main/res/values-ca-rES/strings_intro.xml b/app/src/main/res/values-ca/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-ca-rES/strings_intro.xml
rename to app/src/main/res/values-ca/strings_intro.xml
diff --git a/app/src/main/res/values-ca-rES/strings_main.xml b/app/src/main/res/values-ca/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-ca-rES/strings_main.xml
rename to app/src/main/res/values-ca/strings_main.xml
diff --git a/app/src/main/res/values-ca-rES/strings_settings.xml b/app/src/main/res/values-ca/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-ca-rES/strings_settings.xml
rename to app/src/main/res/values-ca/strings_settings.xml
diff --git a/app/src/main/res/values-cs-rCZ/strings_about.xml b/app/src/main/res/values-cs/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/strings_about.xml
rename to app/src/main/res/values-cs/strings_about.xml
diff --git a/app/src/main/res/values-cs-rCZ/strings_auth.xml b/app/src/main/res/values-cs/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/strings_auth.xml
rename to app/src/main/res/values-cs/strings_auth.xml
diff --git a/app/src/main/res/values-cs-rCZ/strings_backup.xml b/app/src/main/res/values-cs/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/strings_backup.xml
rename to app/src/main/res/values-cs/strings_backup.xml
diff --git a/app/src/main/res/values-cs-rCZ/strings_intro.xml b/app/src/main/res/values-cs/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/strings_intro.xml
rename to app/src/main/res/values-cs/strings_intro.xml
diff --git a/app/src/main/res/values-cs-rCZ/strings_main.xml b/app/src/main/res/values-cs/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/strings_main.xml
rename to app/src/main/res/values-cs/strings_main.xml
diff --git a/app/src/main/res/values-cs-rCZ/strings_settings.xml b/app/src/main/res/values-cs/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-cs-rCZ/strings_settings.xml
rename to app/src/main/res/values-cs/strings_settings.xml
diff --git a/app/src/main/res/values-de-rDE/strings_about.xml b/app/src/main/res/values-de/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/strings_about.xml
rename to app/src/main/res/values-de/strings_about.xml
diff --git a/app/src/main/res/values-de-rDE/strings_auth.xml b/app/src/main/res/values-de/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/strings_auth.xml
rename to app/src/main/res/values-de/strings_auth.xml
diff --git a/app/src/main/res/values-de-rDE/strings_backup.xml b/app/src/main/res/values-de/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/strings_backup.xml
rename to app/src/main/res/values-de/strings_backup.xml
diff --git a/app/src/main/res/values-de-rDE/strings_intro.xml b/app/src/main/res/values-de/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/strings_intro.xml
rename to app/src/main/res/values-de/strings_intro.xml
diff --git a/app/src/main/res/values-de-rDE/strings_main.xml b/app/src/main/res/values-de/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/strings_main.xml
rename to app/src/main/res/values-de/strings_main.xml
diff --git a/app/src/main/res/values-de-rDE/strings_settings.xml b/app/src/main/res/values-de/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-de-rDE/strings_settings.xml
rename to app/src/main/res/values-de/strings_settings.xml
diff --git a/app/src/main/res/values-el-rGR/strings_about.xml b/app/src/main/res/values-el/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/strings_about.xml
rename to app/src/main/res/values-el/strings_about.xml
diff --git a/app/src/main/res/values-el-rGR/strings_auth.xml b/app/src/main/res/values-el/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/strings_auth.xml
rename to app/src/main/res/values-el/strings_auth.xml
diff --git a/app/src/main/res/values-el-rGR/strings_backup.xml b/app/src/main/res/values-el/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/strings_backup.xml
rename to app/src/main/res/values-el/strings_backup.xml
diff --git a/app/src/main/res/values-el-rGR/strings_intro.xml b/app/src/main/res/values-el/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/strings_intro.xml
rename to app/src/main/res/values-el/strings_intro.xml
diff --git a/app/src/main/res/values-el-rGR/strings_main.xml b/app/src/main/res/values-el/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/strings_main.xml
rename to app/src/main/res/values-el/strings_main.xml
diff --git a/app/src/main/res/values-el-rGR/strings_settings.xml b/app/src/main/res/values-el/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-el-rGR/strings_settings.xml
rename to app/src/main/res/values-el/strings_settings.xml
diff --git a/app/src/main/res/values-es-rES/strings_about.xml b/app/src/main/res/values-es/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/strings_about.xml
rename to app/src/main/res/values-es/strings_about.xml
diff --git a/app/src/main/res/values-es-rES/strings_auth.xml b/app/src/main/res/values-es/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/strings_auth.xml
rename to app/src/main/res/values-es/strings_auth.xml
diff --git a/app/src/main/res/values-es-rES/strings_backup.xml b/app/src/main/res/values-es/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/strings_backup.xml
rename to app/src/main/res/values-es/strings_backup.xml
diff --git a/app/src/main/res/values-es-rES/strings_intro.xml b/app/src/main/res/values-es/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/strings_intro.xml
rename to app/src/main/res/values-es/strings_intro.xml
diff --git a/app/src/main/res/values-es-rES/strings_main.xml b/app/src/main/res/values-es/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/strings_main.xml
rename to app/src/main/res/values-es/strings_main.xml
diff --git a/app/src/main/res/values-es-rES/strings_settings.xml b/app/src/main/res/values-es/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-es-rES/strings_settings.xml
rename to app/src/main/res/values-es/strings_settings.xml
diff --git a/app/src/main/res/values-fa-rIR/strings_about.xml b/app/src/main/res/values-fa/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-fa-rIR/strings_about.xml
rename to app/src/main/res/values-fa/strings_about.xml
diff --git a/app/src/main/res/values-fa-rIR/strings_auth.xml b/app/src/main/res/values-fa/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-fa-rIR/strings_auth.xml
rename to app/src/main/res/values-fa/strings_auth.xml
diff --git a/app/src/main/res/values-fa-rIR/strings_backup.xml b/app/src/main/res/values-fa/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-fa-rIR/strings_backup.xml
rename to app/src/main/res/values-fa/strings_backup.xml
diff --git a/app/src/main/res/values-fa-rIR/strings_intro.xml b/app/src/main/res/values-fa/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-fa-rIR/strings_intro.xml
rename to app/src/main/res/values-fa/strings_intro.xml
diff --git a/app/src/main/res/values-fa-rIR/strings_main.xml b/app/src/main/res/values-fa/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-fa-rIR/strings_main.xml
rename to app/src/main/res/values-fa/strings_main.xml
diff --git a/app/src/main/res/values-fa-rIR/strings_settings.xml b/app/src/main/res/values-fa/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-fa-rIR/strings_settings.xml
rename to app/src/main/res/values-fa/strings_settings.xml
diff --git a/app/src/main/res/values-fr-rFR/strings_about.xml b/app/src/main/res/values-fr/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings_about.xml
rename to app/src/main/res/values-fr/strings_about.xml
diff --git a/app/src/main/res/values-fr-rFR/strings_auth.xml b/app/src/main/res/values-fr/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings_auth.xml
rename to app/src/main/res/values-fr/strings_auth.xml
diff --git a/app/src/main/res/values-fr-rFR/strings_backup.xml b/app/src/main/res/values-fr/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings_backup.xml
rename to app/src/main/res/values-fr/strings_backup.xml
diff --git a/app/src/main/res/values-fr-rFR/strings_intro.xml b/app/src/main/res/values-fr/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings_intro.xml
rename to app/src/main/res/values-fr/strings_intro.xml
diff --git a/app/src/main/res/values-fr-rFR/strings_main.xml b/app/src/main/res/values-fr/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings_main.xml
rename to app/src/main/res/values-fr/strings_main.xml
diff --git a/app/src/main/res/values-fr-rFR/strings_settings.xml b/app/src/main/res/values-fr/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-fr-rFR/strings_settings.xml
rename to app/src/main/res/values-fr/strings_settings.xml
diff --git a/app/src/main/res/values-gl-rES/strings_about.xml b/app/src/main/res/values-gl/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-gl-rES/strings_about.xml
rename to app/src/main/res/values-gl/strings_about.xml
diff --git a/app/src/main/res/values-gl-rES/strings_auth.xml b/app/src/main/res/values-gl/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-gl-rES/strings_auth.xml
rename to app/src/main/res/values-gl/strings_auth.xml
diff --git a/app/src/main/res/values-gl-rES/strings_backup.xml b/app/src/main/res/values-gl/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-gl-rES/strings_backup.xml
rename to app/src/main/res/values-gl/strings_backup.xml
diff --git a/app/src/main/res/values-gl-rES/strings_intro.xml b/app/src/main/res/values-gl/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-gl-rES/strings_intro.xml
rename to app/src/main/res/values-gl/strings_intro.xml
diff --git a/app/src/main/res/values-gl-rES/strings_main.xml b/app/src/main/res/values-gl/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-gl-rES/strings_main.xml
rename to app/src/main/res/values-gl/strings_main.xml
diff --git a/app/src/main/res/values-gl-rES/strings_settings.xml b/app/src/main/res/values-gl/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-gl-rES/strings_settings.xml
rename to app/src/main/res/values-gl/strings_settings.xml
diff --git a/app/src/main/res/values-hi-rIN/strings_about.xml b/app/src/main/res/values-hi/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-hi-rIN/strings_about.xml
rename to app/src/main/res/values-hi/strings_about.xml
diff --git a/app/src/main/res/values-hi-rIN/strings_auth.xml b/app/src/main/res/values-hi/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-hi-rIN/strings_auth.xml
rename to app/src/main/res/values-hi/strings_auth.xml
diff --git a/app/src/main/res/values-hi-rIN/strings_backup.xml b/app/src/main/res/values-hi/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-hi-rIN/strings_backup.xml
rename to app/src/main/res/values-hi/strings_backup.xml
diff --git a/app/src/main/res/values-hi-rIN/strings_intro.xml b/app/src/main/res/values-hi/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-hi-rIN/strings_intro.xml
rename to app/src/main/res/values-hi/strings_intro.xml
diff --git a/app/src/main/res/values-hi-rIN/strings_main.xml b/app/src/main/res/values-hi/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-hi-rIN/strings_main.xml
rename to app/src/main/res/values-hi/strings_main.xml
diff --git a/app/src/main/res/values-hi-rIN/strings_settings.xml b/app/src/main/res/values-hi/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-hi-rIN/strings_settings.xml
rename to app/src/main/res/values-hi/strings_settings.xml
diff --git a/app/src/main/res/values-hu-rHU/strings_about.xml b/app/src/main/res/values-hu/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-hu-rHU/strings_about.xml
rename to app/src/main/res/values-hu/strings_about.xml
diff --git a/app/src/main/res/values-hu-rHU/strings_auth.xml b/app/src/main/res/values-hu/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-hu-rHU/strings_auth.xml
rename to app/src/main/res/values-hu/strings_auth.xml
diff --git a/app/src/main/res/values-hu-rHU/strings_backup.xml b/app/src/main/res/values-hu/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-hu-rHU/strings_backup.xml
rename to app/src/main/res/values-hu/strings_backup.xml
diff --git a/app/src/main/res/values-hu-rHU/strings_intro.xml b/app/src/main/res/values-hu/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-hu-rHU/strings_intro.xml
rename to app/src/main/res/values-hu/strings_intro.xml
diff --git a/app/src/main/res/values-hu-rHU/strings_main.xml b/app/src/main/res/values-hu/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-hu-rHU/strings_main.xml
rename to app/src/main/res/values-hu/strings_main.xml
diff --git a/app/src/main/res/values-hu-rHU/strings_settings.xml b/app/src/main/res/values-hu/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-hu-rHU/strings_settings.xml
rename to app/src/main/res/values-hu/strings_settings.xml
diff --git a/app/src/main/res/values-it-rIT/strings_about.xml b/app/src/main/res/values-it/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/strings_about.xml
rename to app/src/main/res/values-it/strings_about.xml
diff --git a/app/src/main/res/values-it-rIT/strings_auth.xml b/app/src/main/res/values-it/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/strings_auth.xml
rename to app/src/main/res/values-it/strings_auth.xml
diff --git a/app/src/main/res/values-it-rIT/strings_backup.xml b/app/src/main/res/values-it/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/strings_backup.xml
rename to app/src/main/res/values-it/strings_backup.xml
diff --git a/app/src/main/res/values-it-rIT/strings_intro.xml b/app/src/main/res/values-it/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/strings_intro.xml
rename to app/src/main/res/values-it/strings_intro.xml
diff --git a/app/src/main/res/values-it-rIT/strings_main.xml b/app/src/main/res/values-it/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/strings_main.xml
rename to app/src/main/res/values-it/strings_main.xml
diff --git a/app/src/main/res/values-it-rIT/strings_settings.xml b/app/src/main/res/values-it/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-it-rIT/strings_settings.xml
rename to app/src/main/res/values-it/strings_settings.xml
diff --git a/app/src/main/res/values-ja-rJP/strings_about.xml b/app/src/main/res/values-ja/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/strings_about.xml
rename to app/src/main/res/values-ja/strings_about.xml
diff --git a/app/src/main/res/values-ja-rJP/strings_auth.xml b/app/src/main/res/values-ja/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/strings_auth.xml
rename to app/src/main/res/values-ja/strings_auth.xml
diff --git a/app/src/main/res/values-ja-rJP/strings_backup.xml b/app/src/main/res/values-ja/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/strings_backup.xml
rename to app/src/main/res/values-ja/strings_backup.xml
diff --git a/app/src/main/res/values-ja-rJP/strings_intro.xml b/app/src/main/res/values-ja/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/strings_intro.xml
rename to app/src/main/res/values-ja/strings_intro.xml
diff --git a/app/src/main/res/values-ja-rJP/strings_main.xml b/app/src/main/res/values-ja/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/strings_main.xml
rename to app/src/main/res/values-ja/strings_main.xml
diff --git a/app/src/main/res/values-ja-rJP/strings_settings.xml b/app/src/main/res/values-ja/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-ja-rJP/strings_settings.xml
rename to app/src/main/res/values-ja/strings_settings.xml
diff --git a/app/src/main/res/values-nl-rNL/strings_about.xml b/app/src/main/res/values-nl/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/strings_about.xml
rename to app/src/main/res/values-nl/strings_about.xml
diff --git a/app/src/main/res/values-nl-rNL/strings_auth.xml b/app/src/main/res/values-nl/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/strings_auth.xml
rename to app/src/main/res/values-nl/strings_auth.xml
diff --git a/app/src/main/res/values-nl-rNL/strings_backup.xml b/app/src/main/res/values-nl/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/strings_backup.xml
rename to app/src/main/res/values-nl/strings_backup.xml
diff --git a/app/src/main/res/values-nl-rNL/strings_intro.xml b/app/src/main/res/values-nl/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/strings_intro.xml
rename to app/src/main/res/values-nl/strings_intro.xml
diff --git a/app/src/main/res/values-nl-rNL/strings_main.xml b/app/src/main/res/values-nl/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/strings_main.xml
rename to app/src/main/res/values-nl/strings_main.xml
diff --git a/app/src/main/res/values-nl-rNL/strings_settings.xml b/app/src/main/res/values-nl/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-nl-rNL/strings_settings.xml
rename to app/src/main/res/values-nl/strings_settings.xml
diff --git a/app/src/main/res/values-pl-rPL/strings_about.xml b/app/src/main/res/values-pl/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/strings_about.xml
rename to app/src/main/res/values-pl/strings_about.xml
diff --git a/app/src/main/res/values-pl-rPL/strings_auth.xml b/app/src/main/res/values-pl/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/strings_auth.xml
rename to app/src/main/res/values-pl/strings_auth.xml
diff --git a/app/src/main/res/values-pl-rPL/strings_backup.xml b/app/src/main/res/values-pl/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/strings_backup.xml
rename to app/src/main/res/values-pl/strings_backup.xml
diff --git a/app/src/main/res/values-pl-rPL/strings_intro.xml b/app/src/main/res/values-pl/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/strings_intro.xml
rename to app/src/main/res/values-pl/strings_intro.xml
diff --git a/app/src/main/res/values-pl-rPL/strings_main.xml b/app/src/main/res/values-pl/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/strings_main.xml
rename to app/src/main/res/values-pl/strings_main.xml
diff --git a/app/src/main/res/values-pl-rPL/strings_settings.xml b/app/src/main/res/values-pl/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-pl-rPL/strings_settings.xml
rename to app/src/main/res/values-pl/strings_settings.xml
diff --git a/app/src/main/res/values-ru-rRU/strings_about.xml b/app/src/main/res/values-ru/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/strings_about.xml
rename to app/src/main/res/values-ru/strings_about.xml
diff --git a/app/src/main/res/values-ru-rRU/strings_auth.xml b/app/src/main/res/values-ru/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/strings_auth.xml
rename to app/src/main/res/values-ru/strings_auth.xml
diff --git a/app/src/main/res/values-ru-rRU/strings_backup.xml b/app/src/main/res/values-ru/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/strings_backup.xml
rename to app/src/main/res/values-ru/strings_backup.xml
diff --git a/app/src/main/res/values-ru-rRU/strings_intro.xml b/app/src/main/res/values-ru/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/strings_intro.xml
rename to app/src/main/res/values-ru/strings_intro.xml
diff --git a/app/src/main/res/values-ru-rRU/strings_main.xml b/app/src/main/res/values-ru/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/strings_main.xml
rename to app/src/main/res/values-ru/strings_main.xml
diff --git a/app/src/main/res/values-ru-rRU/strings_settings.xml b/app/src/main/res/values-ru/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-ru-rRU/strings_settings.xml
rename to app/src/main/res/values-ru/strings_settings.xml
diff --git a/app/src/main/res/values-sl-rSI/strings_about.xml b/app/src/main/res/values-sl/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/strings_about.xml
rename to app/src/main/res/values-sl/strings_about.xml
diff --git a/app/src/main/res/values-sl-rSI/strings_auth.xml b/app/src/main/res/values-sl/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/strings_auth.xml
rename to app/src/main/res/values-sl/strings_auth.xml
diff --git a/app/src/main/res/values-sl-rSI/strings_backup.xml b/app/src/main/res/values-sl/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/strings_backup.xml
rename to app/src/main/res/values-sl/strings_backup.xml
diff --git a/app/src/main/res/values-sl-rSI/strings_intro.xml b/app/src/main/res/values-sl/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/strings_intro.xml
rename to app/src/main/res/values-sl/strings_intro.xml
diff --git a/app/src/main/res/values-sl-rSI/strings_main.xml b/app/src/main/res/values-sl/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/strings_main.xml
rename to app/src/main/res/values-sl/strings_main.xml
diff --git a/app/src/main/res/values-sl-rSI/strings_settings.xml b/app/src/main/res/values-sl/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-sl-rSI/strings_settings.xml
rename to app/src/main/res/values-sl/strings_settings.xml
diff --git a/app/src/main/res/values-sv-rSE/strings_about.xml b/app/src/main/res/values-sv/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/strings_about.xml
rename to app/src/main/res/values-sv/strings_about.xml
diff --git a/app/src/main/res/values-sv-rSE/strings_auth.xml b/app/src/main/res/values-sv/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/strings_auth.xml
rename to app/src/main/res/values-sv/strings_auth.xml
diff --git a/app/src/main/res/values-sv-rSE/strings_backup.xml b/app/src/main/res/values-sv/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/strings_backup.xml
rename to app/src/main/res/values-sv/strings_backup.xml
diff --git a/app/src/main/res/values-sv-rSE/strings_intro.xml b/app/src/main/res/values-sv/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/strings_intro.xml
rename to app/src/main/res/values-sv/strings_intro.xml
diff --git a/app/src/main/res/values-sv-rSE/strings_main.xml b/app/src/main/res/values-sv/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/strings_main.xml
rename to app/src/main/res/values-sv/strings_main.xml
diff --git a/app/src/main/res/values-sv-rSE/strings_settings.xml b/app/src/main/res/values-sv/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-sv-rSE/strings_settings.xml
rename to app/src/main/res/values-sv/strings_settings.xml
diff --git a/app/src/main/res/values-tr-rTR/strings_about.xml b/app/src/main/res/values-tr/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/strings_about.xml
rename to app/src/main/res/values-tr/strings_about.xml
diff --git a/app/src/main/res/values-tr-rTR/strings_auth.xml b/app/src/main/res/values-tr/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/strings_auth.xml
rename to app/src/main/res/values-tr/strings_auth.xml
diff --git a/app/src/main/res/values-tr-rTR/strings_backup.xml b/app/src/main/res/values-tr/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/strings_backup.xml
rename to app/src/main/res/values-tr/strings_backup.xml
diff --git a/app/src/main/res/values-tr-rTR/strings_intro.xml b/app/src/main/res/values-tr/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/strings_intro.xml
rename to app/src/main/res/values-tr/strings_intro.xml
diff --git a/app/src/main/res/values-tr-rTR/strings_main.xml b/app/src/main/res/values-tr/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/strings_main.xml
rename to app/src/main/res/values-tr/strings_main.xml
diff --git a/app/src/main/res/values-tr-rTR/strings_settings.xml b/app/src/main/res/values-tr/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-tr-rTR/strings_settings.xml
rename to app/src/main/res/values-tr/strings_settings.xml
diff --git a/app/src/main/res/values-uk-rUA/strings_about.xml b/app/src/main/res/values-uk/strings_about.xml
similarity index 100%
rename from app/src/main/res/values-uk-rUA/strings_about.xml
rename to app/src/main/res/values-uk/strings_about.xml
diff --git a/app/src/main/res/values-uk-rUA/strings_auth.xml b/app/src/main/res/values-uk/strings_auth.xml
similarity index 100%
rename from app/src/main/res/values-uk-rUA/strings_auth.xml
rename to app/src/main/res/values-uk/strings_auth.xml
diff --git a/app/src/main/res/values-uk-rUA/strings_backup.xml b/app/src/main/res/values-uk/strings_backup.xml
similarity index 100%
rename from app/src/main/res/values-uk-rUA/strings_backup.xml
rename to app/src/main/res/values-uk/strings_backup.xml
diff --git a/app/src/main/res/values-uk-rUA/strings_intro.xml b/app/src/main/res/values-uk/strings_intro.xml
similarity index 100%
rename from app/src/main/res/values-uk-rUA/strings_intro.xml
rename to app/src/main/res/values-uk/strings_intro.xml
diff --git a/app/src/main/res/values-uk-rUA/strings_main.xml b/app/src/main/res/values-uk/strings_main.xml
similarity index 100%
rename from app/src/main/res/values-uk-rUA/strings_main.xml
rename to app/src/main/res/values-uk/strings_main.xml
diff --git a/app/src/main/res/values-uk-rUA/strings_settings.xml b/app/src/main/res/values-uk/strings_settings.xml
similarity index 100%
rename from app/src/main/res/values-uk-rUA/strings_settings.xml
rename to app/src/main/res/values-uk/strings_settings.xml
diff --git a/app/src/main/res/values/settings.xml b/app/src/main/res/values/settings.xml
index 30dc3967..a914b4f8 100644
--- a/app/src/main/res/values/settings.xml
+++ b/app/src/main/res/values/settings.xml
@@ -22,8 +22,8 @@
     <string name="settings_key_block_accessibility" translatable="false">pref_block_accessibility</string>
     <string name="settings_key_block_autofill" translatable="false">pref_block_autofill</string>
 
-    <string name="settings_key_lang" translatable="false">pref_lang</string>    <!-- Deprecated -->
-    <string name="settings_key_locale" translatable="false">pref_locale</string>
+    <string name="settings_key_lang" translatable="false">pref_lang</string>
+    <string name="settings_key_locale" translatable="false">pref_locale</string>                        <!-- Deprecated -->
     <string name="settings_key_theme" translatable="false">pref_theme</string>
     <string name="settings_key_label_size" translatable="false">pref_label_size_sp</string>
     <string name="settings_key_card_layout" translatable="false">pref_card_layout</string>
@@ -71,7 +71,7 @@
     <integer name="settings_default_tap_to_reveal_timeout">30</integer>
     <integer name="settings_default_auth_inactivity_delay">30</integer>
     <string name="settings_default_encryption" translatable="false">keystore</string>
-    <string name="settings_default_locale" translatable="false">system</string>
+    <string name="settings_default_lang" translatable="false">system</string>
     <string name="settings_default_theme" translatable="false">light</string>
     <integer name="settings_default_label_size">18</integer>
     <string name="settings_default_card_layout" translatable="false">default</string>
@@ -135,33 +135,31 @@
         <item>all_edits</item>
     </string-array>
 
-
-
-    <string-array name="settings_values_locale" translatable="false">
+    <string-array name="settings_values_lang" translatable="false">
         <item>system</item>
-        <item>ca_ES</item>
-        <item>de_DE</item>
-        <item>en_US</item>
-        <item>es_ES</item>
-        <item>fr_FR</item>
-        <item>gl_ES</item>
-        <item>it_IT</item>
-        <item>hu_HU</item>
-        <item>nl_NL</item>
-        <item>pl_PL</item>
+        <item>ca</item>
+        <item>de</item>
+        <item>en</item>
+        <item>es</item>
+        <item>fr</item>
+        <item>gl</item>
+        <item>it</item>
+        <item>hu</item>
+        <item>nl</item>
+        <item>pl</item>
         <item>pt_BR</item>
-        <item>sl_SI</item>
-        <item>sv_SE</item>
-        <item>tr_TR</item>
-        <item>cs_CZ</item>
-        <item>el_GR</item>
-        <item>ru_RU</item>
-        <item>uk_UA</item>
-        <item>bg_BG</item>
-        <item>ar_SA</item>
-        <item>fa_IR</item>
-        <item>hi_IN</item>
-        <item>ja_JP</item>
+        <item>sl</item>
+        <item>sv</item>
+        <item>tr</item>
+        <item>cs</item>
+        <item>el</item>
+        <item>ru</item>
+        <item>uk</item>
+        <item>bg</item>
+        <item>ar</item>
+        <item>fa</item>
+        <item>hi</item>
+        <item>ja</item>
         <item>zh_CN</item>
         <item>zh_TW</item>
     </string-array>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 59e2c225..f850ab19 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -80,12 +80,12 @@
         android:title="@string/settings_category_title_ui">
 
         <ListPreference
-            android:key="@string/settings_key_locale"
+            android:key="@string/settings_key_lang"
             android:title="@string/settings_title_lang"
             android:summary="%s"
             android:entries="@array/settings_entries_lang"
-            android:entryValues="@array/settings_values_locale"
-            android:defaultValue="@string/settings_default_locale" />
+            android:entryValues="@array/settings_values_lang"
+            android:defaultValue="@string/settings_default_lang" />
 
         <ListPreference
             android:key="@string/settings_key_theme"