Showing saturation/brightness/threshold percentage

4 years ago · c8410ddea8
parent f493e93fb8
commit c8410ddea8
42 changed files with 59 additions and 158 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@ -61,6 +61,8 @@ import com.flask.colorpicker.ColorPickerView;
 import com.flask.colorpicker.builder.ColorPickerClickListener;
 import com.flask.colorpicker.builder.ColorPickerDialogBuilder;

+import java.text.NumberFormat;
+
 public class FragmentOptionsDisplay extends FragmentBase implements SharedPreferences.OnSharedPreferenceChangeListener {
    private Button btnTheme;
    private Spinner spStartup;
@ -92,8 +94,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
    private ImageView ivRed;
    private ImageView ivGreen;
    private ImageView ivBlue;
+    private TextView tvSaturation;
    private SeekBar sbSaturation;
+    private TextView tvBrightness;
    private SeekBar sbBrightness;
+    private TextView tvThreshold;
    private SeekBar sbThreshold;
    private SwitchCompat swNameEmail;
    private SwitchCompat swPreferContact;
@ -134,6 +139,8 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
    private SwitchCompat swParseClasses;
    private SwitchCompat swAuthentication;

+    private NumberFormat NF = NumberFormat.getNumberInstance();
+
    private final static String[] RESET_OPTIONS = new String[]{
            "theme", "startup", "cards", "beige", "date", "navbar_colorize", "portrait2", "landscape", "landscape3",
            "threading", "threading_unread", "indentation", "seekbar", "actionbar", "actionbar_color",
@ -190,8 +197,11 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
        ivRed = view.findViewById(R.id.ivRed);
        ivGreen = view.findViewById(R.id.ivGreen);
        ivBlue = view.findViewById(R.id.ivBlue);
+        tvSaturation = view.findViewById(R.id.tvSaturation);
        sbSaturation = view.findViewById(R.id.sbSaturation);
+        tvBrightness = view.findViewById(R.id.tvBrightness);
        sbBrightness = view.findViewById(R.id.sbBrightness);
+        tvThreshold = view.findViewById(R.id.tvThreshold);
        sbThreshold = view.findViewById(R.id.sbThreshold);
        swNameEmail = view.findViewById(R.id.swNameEmail);
        swPreferContact = view.findViewById(R.id.swPreferContact);
@ -912,11 +922,19 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
        swIdenticons.setEnabled(swGeneratedIcons.isChecked());
        swCircular.setChecked(prefs.getBoolean("circular", true));

-        sbSaturation.setProgress(prefs.getInt("saturation", 100));
+        int saturation = prefs.getInt("saturation", 100);
+        tvSaturation.setText(getString(R.string.title_advanced_color_saturation, NF.format(saturation)));
+        sbSaturation.setProgress(saturation);
        sbSaturation.setEnabled(swGeneratedIcons.isChecked());
-        sbBrightness.setProgress(prefs.getInt("brightness", 100));
+
+        int brightness = prefs.getInt("brightness", 100);
+        tvBrightness.setText(getString(R.string.title_advanced_color_value, NF.format(brightness)));
+        sbBrightness.setProgress(brightness);
        sbBrightness.setEnabled(swGeneratedIcons.isChecked());
-        sbThreshold.setProgress(prefs.getInt("threshold", 50));
+
+        int threshold = prefs.getInt("threshold", 50);
+        tvThreshold.setText(getString(R.string.title_advanced_color_threshold, NF.format(threshold)));
+        sbThreshold.setProgress(threshold);
        sbThreshold.setEnabled(swGeneratedIcons.isChecked());

        swNameEmail.setChecked(prefs.getBoolean("name_email", false));
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@ -266,9 +266,6 @@
    <string name="title_advanced_generated_icons">Показване на генерираните икони</string>
    <string name="title_advanced_identicons">Покажи икони за идентичност</string>
    <string name="title_advanced_circular">Закръглени икони</string>
-    <string name="title_advanced_color_saturation">Наситеност</string>
-    <string name="title_advanced_color_value">Яркост</string>
-    <string name="title_advanced_color_threshold">Бяла или черна буква в генерирани икони</string>
    <string name="title_advanced_name_email">Покажи имена и имейл адреси</string>
    <string name="title_advanced_replace_name">Предпочитано име от контакти пред изпратено име</string>
    <string name="title_advanced_distinguish_contacts">Подчертайте подателя, когато подателят е известен като локаленен „до“ контакт</string>
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@ -268,9 +268,6 @@ La creació i l\'ús de regles és una característica professional.    </string
    <string name="title_advanced_generated_icons">Mostra les icones generades</string>
    <string name="title_advanced_identicons">Mostra identicons</string>
    <string name="title_advanced_circular">Mostra icones rodones</string>
-    <string name="title_advanced_color_saturation">Saturació</string>
-    <string name="title_advanced_color_value">Brillantor</string>
-    <string name="title_advanced_color_threshold">Color de lletra del llindar</string>
    <string name="title_advanced_name_email">Mostra els noms i les adreces de correu</string>
    <string name="title_advanced_replace_name">Preferiu el nom de contacte que el nom enviat</string>
    <string name="title_advanced_distinguish_contacts">Subratlla l’emissor quan el remitent es coneix com a contacte “a” local</string>
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@ -324,9 +324,6 @@
    <string name="title_advanced_generated_icons">Zobrazit generované ikony</string>
    <string name="title_advanced_identicons">Zobrazit identikony</string>
    <string name="title_advanced_circular">Zobrazit kulaté ikony</string>
-    <string name="title_advanced_color_saturation">Saturace</string>
-    <string name="title_advanced_color_value">Jas</string>
-    <string name="title_advanced_color_threshold">Mezní hodnota barvy písmena</string>
    <string name="title_advanced_name_email">Zobrazit jména a e-mailové adresy</string>
    <string name="title_advanced_replace_name">Preferovat jméno z kontaktu namísto z hlavičky</string>
    <string name="title_advanced_distinguish_contacts">Podtrhnout odesílatele, je-li známý jako lokální „komu“ kontakt</string>
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@ -220,9 +220,6 @@
    <string name="title_setup_defaults">Gendan standardværdier</string>
    <string name="title_setup_reset_questions">Nulstil spørgsmål</string>
    <string name="title_advanced_hint_title">Flere avancerede indstillinger</string>
-    <string name="title_advanced_hint_message">        Der gås nu til de mere avancerede indstillinger.
-        Alle valgmuligheder har almindeligt brugte standardværdier, som kan ændres jf. dine præferencer.
-    </string>
    <string name="title_advanced_section_main">Primær</string>
    <string name="title_advanced_section_synchronize">Modtag</string>
    <string name="title_advanced_section_send">Send</string>
@ -308,9 +305,6 @@
    <string name="title_advanced_generated_icons">Vis genererede ikoner</string>
    <string name="title_advanced_identicons">Vis identikoner</string>
    <string name="title_advanced_circular">Vis runde ikoner</string>
-    <string name="title_advanced_color_saturation">Mætning</string>
-    <string name="title_advanced_color_value">Lysstyrke</string>
-    <string name="title_advanced_color_threshold">Grænseværdi, bogstavsfarve</string>
    <string name="title_advanced_name_email">Vis navne og e-mailadresser</string>
    <string name="title_advanced_replace_name">Foretræk Kontakt- fremfor Afsendernavn</string>
    <string name="title_advanced_distinguish_contacts">Understreg afsender, når denne er kendt som lokal \'Til\'-kontakt</string>
--- a/app/src/main/res/values-de-rAT/strings.xml
+++ b/app/src/main/res/values-de-rAT/strings.xml
@ -221,7 +221,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
    <string name="title_setup_defaults">Standardeinstellungen wiederherstellen</string>
    <string name="title_setup_reset_questions">Fragen zurücksetzen</string>
    <string name="title_advanced_hint_title">Erweiterte Optionen</string>
-    <string name="title_advanced_hint_message">Sie wechseln zu den erweiterten Optionen. Alle Optionen haben allgemein verwendete Standardwerte, die geändert werden können, aber nicht müssen, wenn Sie andere Einstellungen bevorzugen.    </string>
+    <string name="title_advanced_hint_message">Sie wechseln zu den erweiterten Optionen. Alle Optionen haben allgemein verwendete Standardwerte, die nur geändert werden sollten, wenn Sie andere Einstellungen bevorzugen.    </string>
    <string name="title_advanced_section_main">Haupteinstellungen</string>
    <string name="title_advanced_section_synchronize">Empfangen</string>
    <string name="title_advanced_section_send">Senden</string>
@ -307,9 +307,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
    <string name="title_advanced_generated_icons">Generierte Symbole anzeigen (Anfangsbuchstaben)</string>
    <string name="title_advanced_identicons">Identicons anzeigen</string>
    <string name="title_advanced_circular">Runde Symbole anzeigen</string>
-    <string name="title_advanced_color_saturation">Sättigung</string>
-    <string name="title_advanced_color_value">Helligkeit</string>
-    <string name="title_advanced_color_threshold">Schwellenwert für Buchstabenfarbe</string>
    <string name="title_advanced_name_email">Namen und E-Mail-Adressen anzeigen</string>
    <string name="title_advanced_replace_name">Einen Kontaktnamen gegenüber einem gesendeten Namen bevorzugen</string>
    <string name="title_advanced_distinguish_contacts">Den Sender unterstrichen darstellen, wenn er ein bekannter lokaler \'An\'-Kontakt ist</string>
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@ -221,7 +221,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
    <string name="title_setup_defaults">Standardeinstellungen wiederherstellen</string>
    <string name="title_setup_reset_questions">Fragen zurücksetzen</string>
    <string name="title_advanced_hint_title">Erweiterte Optionen</string>
-    <string name="title_advanced_hint_message">Sie wechseln zu den erweiterten Optionen. Alle Optionen haben allgemein verwendete Standardwerte, die geändert werden können, aber nicht müssen, wenn Sie andere Einstellungen bevorzugen.    </string>
+    <string name="title_advanced_hint_message">Sie wechseln zu den erweiterten Optionen. Alle Optionen haben allgemein verwendete Standardwerte, die nur geändert werden sollten, wenn Sie andere Einstellungen bevorzugen.    </string>
    <string name="title_advanced_section_main">Haupteinstellungen</string>
    <string name="title_advanced_section_synchronize">Empfangen</string>
    <string name="title_advanced_section_send">Senden</string>
@ -307,9 +307,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
    <string name="title_advanced_generated_icons">Generierte Symbole anzeigen (Anfangsbuchstaben)</string>
    <string name="title_advanced_identicons">Identicons anzeigen</string>
    <string name="title_advanced_circular">Runde Symbole anzeigen</string>
-    <string name="title_advanced_color_saturation">Sättigung</string>
-    <string name="title_advanced_color_value">Helligkeit</string>
-    <string name="title_advanced_color_threshold">Schwellenwert für Buchstabenfarbe</string>
    <string name="title_advanced_name_email">Namen und E-Mail-Adressen anzeigen</string>
    <string name="title_advanced_replace_name">Einen Kontaktnamen gegenüber einem gesendeten Namen bevorzugen</string>
    <string name="title_advanced_distinguish_contacts">Den Sender unterstrichen darstellen, wenn er ein bekannter lokaler \'An\'-Kontakt ist</string>
--- a/app/src/main/res/values-de-rLI/strings.xml
+++ b/app/src/main/res/values-de-rLI/strings.xml
@ -221,7 +221,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
    <string name="title_setup_defaults">Standardeinstellungen wiederherstellen</string>
    <string name="title_setup_reset_questions">Fragen zurücksetzen</string>
    <string name="title_advanced_hint_title">Erweiterte Optionen</string>
-    <string name="title_advanced_hint_message">Sie wechseln zu den erweiterten Optionen. Alle Optionen haben allgemein verwendete Standardwerte, die geändert werden können, aber nicht müssen, wenn Sie andere Einstellungen bevorzugen.    </string>
+    <string name="title_advanced_hint_message">Sie wechseln zu den erweiterten Optionen. Alle Optionen haben allgemein verwendete Standardwerte, die nur geändert werden sollten, wenn Sie andere Einstellungen bevorzugen.    </string>
    <string name="title_advanced_section_main">Haupteinstellungen</string>
    <string name="title_advanced_section_synchronize">Empfangen</string>
    <string name="title_advanced_section_send">Senden</string>
@ -307,9 +307,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
    <string name="title_advanced_generated_icons">Generierte Symbole anzeigen (Anfangsbuchstaben)</string>
    <string name="title_advanced_identicons">Identicons anzeigen</string>
    <string name="title_advanced_circular">Runde Symbole anzeigen</string>
-    <string name="title_advanced_color_saturation">Sättigung</string>
-    <string name="title_advanced_color_value">Helligkeit</string>
-    <string name="title_advanced_color_threshold">Schwellenwert für Buchstabenfarbe</string>
    <string name="title_advanced_name_email">Namen und E-Mail-Adressen anzeigen</string>
    <string name="title_advanced_replace_name">Einen Kontaktnamen gegenüber einem gesendeten Namen bevorzugen</string>
    <string name="title_advanced_distinguish_contacts">Den Sender unterstrichen darstellen, wenn er ein bekannter lokaler \'An\'-Kontakt ist</string>
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@ -220,9 +220,6 @@
    <string name="title_setup_defaults">Επαναφορά προεπιλογών</string>
    <string name="title_setup_reset_questions">Επαναφορά ερωτήσεων</string>
    <string name="title_advanced_hint_title">Πιο προηγμένες επιλογές</string>
-    <string name="title_advanced_hint_message">        Τώρα περιηγείστε στις πιο προχωρημένες ρυθμίσεις.
-        Όλες οι επιλογές έχουν τις πιο συνηθισμένες τυπικές τιμές, οι οποίες μπορούν, αλλά δεν χρειάζεται να αλλάξουν, εάν έχετε μία διαφορετική προτίμηση.
-    </string>
    <string name="title_advanced_section_main">Κύριες</string>
    <string name="title_advanced_section_synchronize">Λήψη</string>
    <string name="title_advanced_section_send">Αποστολή</string>
@ -308,9 +305,6 @@
    <string name="title_advanced_generated_icons">Να προβάλλονται εικονίδια που δημιουργούνται αυτόματα</string>
    <string name="title_advanced_identicons">Προβολή identicon</string>
    <string name="title_advanced_circular">Στρογγυλεμένα εικονίδια</string>
-    <string name="title_advanced_color_saturation">Κορεσμός</string>
-    <string name="title_advanced_color_value">Φωτεινότητα</string>
-    <string name="title_advanced_color_threshold">Κατώφλι για τον καθορισμό του χρώματος του γράμματος</string>
    <string name="title_advanced_name_email">Να προβάλλονται τα ονόματα και οι διευθύνσεις ηλεκτρονικού ταχυδρομείου</string>
    <string name="title_advanced_replace_name">Να προτιμάται το όνομα της επαφής αντί για το όνομα του αποστολέα</string>
    <string name="title_advanced_distinguish_contacts">Να υπογραμμίζεται ο αποστολέας όταν ο αποστολέας είναι γνωστός ως τοπική επαφή</string>
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@ -10,7 +10,6 @@
    <string name="title_advanced_check_mx">Check sender email addresses on synchronising messages</string>
    <string name="title_advanced_portrait2">Use two rows in portrait mode</string>
    <string name="title_advanced_color_stripe">Show colour stripe</string>
-    <string name="title_advanced_color_threshold">Threshold letter colour</string>
    <string name="title_advanced_flags_background">Show coloured background instead of coloured stars</string>
    <string name="title_advanced_text_color">Use text colours</string>
    <string name="title_advanced_actionbar_color">Use account colour as background colour for conversation action bar</string>
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@ -222,7 +222,7 @@
    <string name="title_setup_reset_questions">Restablecer preguntas</string>
    <string name="title_advanced_hint_title">Opciones más avanzadas</string>
    <string name="title_advanced_hint_message">        Está navegando a las opciones más avanzadas.
-        Todas las opciones tienen por defecto valores estándar que pueden ser modificados si así lo prefiere.
+        Todas las opciones tienen por defecto valores estándar, que no necesitan ser modificados a menos que así lo prefiera.
    </string>
    <string name="title_advanced_section_main">Principal</string>
    <string name="title_advanced_section_synchronize">Recibir</string>
@ -309,9 +309,6 @@
    <string name="title_advanced_generated_icons">Mostrar iconos generados</string>
    <string name="title_advanced_identicons">Mostrar identicons</string>
    <string name="title_advanced_circular">Mostrar iconos redondos</string>
-    <string name="title_advanced_color_saturation">Saturación</string>
-    <string name="title_advanced_color_value">Brillo</string>
-    <string name="title_advanced_color_threshold">Umbral de color de letras</string>
    <string name="title_advanced_name_email">Mostrar nombres y direcciones de correo electrónico</string>
    <string name="title_advanced_replace_name">Preferir un nombre de contacto sobre un nombre enviado</string>
    <string name="title_advanced_distinguish_contacts">Subrayar el remitente cuando el remitente es conocido como contacto \'a:\' local</string>
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@ -266,9 +266,6 @@
    <string name="title_advanced_generated_icons">Erakutsi sortutako ikonoak</string>
    <string name="title_advanced_identicons">Erakutsi identikonoak</string>
    <string name="title_advanced_circular">Erakutsi ikono borobilak</string>
-    <string name="title_advanced_color_saturation">Saturazioa</string>
-    <string name="title_advanced_color_value">Distira</string>
-    <string name="title_advanced_color_threshold">Letren kolorearen atalasea</string>
    <string name="title_advanced_name_email">Erakutsi izenak eta e-mail helbideak</string>
    <string name="title_advanced_replace_name">Nahiago kontaktu-izena bidaltzaile-izena baino</string>
    <string name="title_advanced_distinguish_contacts">Azpimarratu igorlea kontaktua jasotzaile lokalki ezaguna bada</string>
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@ -262,9 +262,6 @@
    <string name="title_advanced_generated_icons">نمایس آیکون‌های تولید شده</string>
    <string name="title_advanced_identicons">نمایش identicons</string>
    <string name="title_advanced_circular">نمایش آیکون‌های گرد</string>
-    <string name="title_advanced_color_saturation">اشباع</string>
-    <string name="title_advanced_color_value">روشنایی</string>
-    <string name="title_advanced_color_threshold">رنگ نویسه آستانه</string>
    <string name="title_advanced_name_email">نام‌ها و نشانی‌های ایمیل را نمایش بده</string>
    <string name="title_advanced_replace_name">نام مخاطب را بر نام فرستنده ترجیح بده</string>
    <string name="title_advanced_show_recipients">گیرندگان را در سرتیتر نمایش بده</string>
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@ -219,9 +219,6 @@
    <string name="title_setup_defaults">Palauta oletukset</string>
    <string name="title_setup_reset_questions">Nollaa kysymykset</string>
    <string name="title_advanced_hint_title">Edistyneemmät asetukset</string>
-    <string name="title_advanced_hint_message">Olet siirtymässä edistyneempiin asetuksiin.
-        Kaikilla asetuksilla on yleisesti käytetyt oletusarvot. Arvoja voi halutessaan vaihtaa.
-    </string>
    <string name="title_advanced_section_main">Yleiset</string>
    <string name="title_advanced_section_synchronize">Vastaanottaminen</string>
    <string name="title_advanced_section_send">Lähettäminen</string>
@ -307,9 +304,6 @@
    <string name="title_advanced_generated_icons">Näytä luodut kuvakkeet</string>
    <string name="title_advanced_identicons">Näytä identikonit</string>
    <string name="title_advanced_circular">Näytä pyöreät kuvakkeet</string>
-    <string name="title_advanced_color_saturation">Värikylläisyys</string>
-    <string name="title_advanced_color_value">Kirkkaus</string>
-    <string name="title_advanced_color_threshold">Kirjasimen värin kynnysarvo</string>
    <string name="title_advanced_name_email">Näytä nimet ja sähköpostiosoitteet</string>
    <string name="title_advanced_replace_name">Käytä ensisijaisesti yhteystiedon nimeä lähettäjän nimen sijaan</string>
    <string name="title_advanced_distinguish_contacts">Alleviivaa lähettäjä tämän ollessa paikallisesti tunnettu vastaanottaja</string>
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@ -221,7 +221,7 @@
    <string name="title_setup_reset_questions">Réinitialiser les questions</string>
    <string name="title_advanced_hint_title">Paramètres avancés</string>
    <string name="title_advanced_hint_message">        Vous parcourez les paramètres avancés.
-        Toutes les options ont des valeurs par défaut couramment utilisées qui peuvent être modifiées si besoin selon vos préférences.
+        Toutes les options ont des valeurs par défaut couramment utilisées que vous n\'avez pas besoin de modifier sauf si vous avez une préférence différente.
    </string>
    <string name="title_advanced_section_main">Principal</string>
    <string name="title_advanced_section_synchronize">Réception</string>
@ -308,9 +308,6 @@
    <string name="title_advanced_generated_icons">Afficher les icônes générées</string>
    <string name="title_advanced_identicons">Afficher les identicônes</string>
    <string name="title_advanced_circular">Afficher des icônes rondes</string>
-    <string name="title_advanced_color_saturation">Saturation</string>
-    <string name="title_advanced_color_value">Luminosité</string>
-    <string name="title_advanced_color_threshold">Seuil pour la couleur de la lettre</string>
    <string name="title_advanced_name_email">Afficher les noms et les adresses courriel</string>
    <string name="title_advanced_replace_name">Préférer un nom de contact à un nom d’envoi</string>
    <string name="title_advanced_distinguish_contacts">Souligner l’expéditeur quand il est connu comme contact local</string>
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@ -221,7 +221,7 @@
    <string name="title_setup_reset_questions">Réinitialiser les questions</string>
    <string name="title_advanced_hint_title">Paramètres avancés</string>
    <string name="title_advanced_hint_message">        Vous parcourez les paramètres avancés.
-        Toutes les options ont des valeurs par défaut couramment utilisées qui peuvent être modifiées si besoin selon vos préférences.
+        Toutes les options ont des valeurs par défaut couramment utilisées que vous n\'avez pas besoin de modifier sauf si vous avez une préférence différente.
    </string>
    <string name="title_advanced_section_main">Principal</string>
    <string name="title_advanced_section_synchronize">Réception</string>
@ -308,9 +308,6 @@
    <string name="title_advanced_generated_icons">Afficher les icônes générées automatiquement</string>
    <string name="title_advanced_identicons">Afficher les identicônes</string>
    <string name="title_advanced_circular">Afficher des icônes rondes</string>
-    <string name="title_advanced_color_saturation">Saturation</string>
-    <string name="title_advanced_color_value">Luminosité</string>
-    <string name="title_advanced_color_threshold">Seuil pour définir la couleur de la lettre</string>
    <string name="title_advanced_name_email">Afficher les noms et les adresses e-mail</string>
    <string name="title_advanced_replace_name">Préférer un nom de contact à un nom d\'envoi</string>
    <string name="title_advanced_distinguish_contacts">Souligner l\'expéditeur lorsqu\'il est connu comme contact local</string>
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@ -302,9 +302,6 @@
    <string name="title_advanced_generated_icons">Sjoch generearre ikoanen</string>
    <string name="title_advanced_identicons">Sjoch identykons</string>
    <string name="title_advanced_circular">Sjoch rûne ikoanen</string>
-    <string name="title_advanced_color_saturation">Sêding</string>
-    <string name="title_advanced_color_value">Dúdlikens</string>
-    <string name="title_advanced_color_threshold">Drompel letterkleur</string>
    <string name="title_advanced_name_email">Sjoch nammen en e-postadressen</string>
    <string name="title_advanced_replace_name">Foarkar in kontaktnamme boppe in ferstjoerde namme</string>
    <string name="title_advanced_distinguish_contacts">Understreke de stjoerder as de stjoerder bekend is as lokaal \'nei\' kontakt</string>
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@ -302,9 +302,6 @@
    <string name="title_advanced_generated_icons">Mostrar iconas xeradas</string>
    <string name="title_advanced_identicons">Mostrar identicons</string>
    <string name="title_advanced_circular">Mostrar iconas redondeadas</string>
-    <string name="title_advanced_color_saturation">Saturación</string>
-    <string name="title_advanced_color_value">Brillo</string>
-    <string name="title_advanced_color_threshold">Limiar da cor das letras</string>
    <string name="title_advanced_name_email">Mostrar nomes e enderezos de email</string>
    <string name="title_advanced_replace_name">Preferir o nome de contacto ao nome do envío</string>
    <string name="title_advanced_distinguish_contacts">Suliñar o remitente cando este é recoñecido como un destinatario local</string>
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@ -270,9 +270,6 @@
    <string name="title_advanced_generated_icons">Prikaži generirane ikone</string>
    <string name="title_advanced_identicons">Pokaži identitete</string>
    <string name="title_advanced_circular">Pokaži okrugle ikone</string>
-    <string name="title_advanced_color_saturation">Saturacija</string>
-    <string name="title_advanced_color_value">Svjetlost</string>
-    <string name="title_advanced_color_threshold">Prag za boju slova</string>
    <string name="title_advanced_name_email">Prikažite imena i adrese e-pošte</string>
    <string name="title_advanced_replace_name">Preferiraj ime kontakta nad poslanim imenom</string>
    <string name="title_advanced_distinguish_contacts">Podvucite pošiljatelja kada je pošiljalac poznat kao lokalni \"za\" kontakt</string>
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@ -304,9 +304,6 @@
    <string name="title_advanced_generated_icons">Generált ikonok megjelenítése</string>
    <string name="title_advanced_identicons">Azonosító-ikonok megjelenítése</string>
    <string name="title_advanced_circular">Megjelenített ikonok lekerekítése</string>
-    <string name="title_advanced_color_saturation">Telítettség</string>
-    <string name="title_advanced_color_value">Fényerő</string>
-    <string name="title_advanced_color_threshold">Betűszín küszöbérték</string>
    <string name="title_advanced_name_email">Nevek és email címek megjelenítése</string>
    <string name="title_advanced_replace_name">Preferálja a névjegyi neveket a küldői nevek helyett</string>
    <string name="title_advanced_distinguish_contacts">Húzza alá a küldőt, ha az egy ismert, korábban megcímzett helyi névjegy</string>
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@ -288,9 +288,6 @@ Akun dan identitas (alias) juga dapat diatur secara manual jika diperlukan. Prot
    <string name="title_advanced_generated_icons">Tampilkan ikon yang dibuat</string>
    <string name="title_advanced_identicons">Tampilkan ikon identitas</string>
    <string name="title_advanced_circular">Tampilan ikon bulat</string>
-    <string name="title_advanced_color_saturation">Kejenuhan</string>
-    <string name="title_advanced_color_value">Kecerahan</string>
-    <string name="title_advanced_color_threshold">Ambang batas warna huruf</string>
    <string name="title_advanced_name_email">Tampilkan nama dan alamat email</string>
    <string name="title_advanced_replace_name">Lebih suka nama kontak di atas nama yang dikirim</string>
    <string name="title_advanced_distinguish_contacts">Garis bawahi pengirim ketika pengirim dikenal sebagai kontak lokal</string>
@ -853,11 +850,23 @@ Akun dan identitas (alias) juga dapat diatur secara manual jika diperlukan. Prot
    <string name="title_unknown_key">Kunci pribadi tidak cocok dengan kunci enkripsi apa pun</string>
    <string name="title_send_reminder_remark">Pengingat dapat diaktifkan kembali di pengaturan kirim</string>
    <string name="title_send_receipt_remark">Sebagian besar layanan penyedia dan klien email mengabaikan permintaan tanda terima</string>
+    <string name="title_subject_reminder">Subjek kosong</string>
+    <string name="title_text_reminder">Pesan kosong</string>
+    <string name="title_attachment_reminder">Apakah Anda berniat menambahkan lampiran?</string>
+    <string name="title_plain_reminder">Semua format akan hilang</string>
+    <string name="title_size_reminder">Pesan (%1$s) melebihi dari batas server (%2$s)</string>
+    <string name="title_attachments_missing">Tidak semua lampiran diunduh</string>
    <string name="title_dialog_hint">Dialog ini dapat diaktifkan lagi melalui menu tiga titik di bilah aksi sebelah atas</string>
+    <string name="title_draft_deleted">Draf dibuang</string>
    <string name="title_draft_saved">Konsep disimpan</string>
    <string name="title_ask_send_via">Kirim pesan kepada %1$s melalui %2$s?</string>
    <string name="title_queued">Mengirim pesan</string>
+    <string name="title_queued_at">Pesan akan dikirim %1$s</string>
+    <string name="title_sign">Tanda Tangani</string>
+    <string name="title_verify">Verifikasi</string>
    <string name="title_encrypt">Enkripsi</string>
+    <string name="title_decrypt">Dekripsi</string>
+    <string name="title_resync">Sinkron ulang</string>
    <string name="title_not_encrypted">Pesan tidak ditandatangani atau dienkripsi</string>
    <string name="title_signature_sender">Tampilkan pilihan gambar</string>
    <string name="title_signature_subject">Subjek</string>
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@ -220,9 +220,6 @@
    <string name="title_setup_defaults">Ripristina predefiniti</string>
    <string name="title_setup_reset_questions">Resetta domande</string>
    <string name="title_advanced_hint_title">Opzioni più avanzate</string>
-    <string name="title_advanced_hint_message">        Stai navigando verso le opzioni più avanzate.
-        Tutte le opzioni hanno valori standard comunemente usati che possono ma non hanno bisogno di essere cambiati se si ha una preferenza diversa.
-    </string>
    <string name="title_advanced_section_main">Principale</string>
    <string name="title_advanced_section_synchronize">Ricevi</string>
    <string name="title_advanced_section_send">Invia</string>
@ -308,9 +305,6 @@
    <string name="title_advanced_generated_icons">Mostra icone generate</string>
    <string name="title_advanced_identicons">Visualizza identicon</string>
    <string name="title_advanced_circular">Mostra icone rotonde</string>
-    <string name="title_advanced_color_saturation">Saturazione</string>
-    <string name="title_advanced_color_value">Luminosità</string>
-    <string name="title_advanced_color_threshold">Soglia colore lettera</string>
    <string name="title_advanced_name_email">Mostra nomi e indirizzi email</string>
    <string name="title_advanced_replace_name">Preferisci un nome di contatto a un nome inviato</string>
    <string name="title_advanced_distinguish_contacts">Sottolinea il mittente quando il mittente è conosciuto come contatto locale \'a\"</string>
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@ -208,9 +208,6 @@ Microsoft Exchange WebサービスやMicrosoft ActiveSyncなどの非標準プ
    <string name="title_setup_defaults">既定に戻します</string>
    <string name="title_setup_reset_questions">質問をリセット</string>
    <string name="title_advanced_hint_title">高度なオプション</string>
-    <string name="title_advanced_hint_message">        高度なオプションに移動しています。
-        全てのオプションには一般的に使用される標準的な値がありますが、設定が異なる場合は、変更する必要はありません。
-    </string>
    <string name="title_advanced_section_main">基本</string>
    <string name="title_advanced_section_synchronize">受信</string>
    <string name="title_advanced_section_send">送信</string>
@ -296,9 +293,6 @@ Microsoft Exchange WebサービスやMicrosoft ActiveSyncなどの非標準プ
    <string name="title_advanced_generated_icons">生成されたアイコンを表示</string>
    <string name="title_advanced_identicons">識別アイコンを表示</string>
    <string name="title_advanced_circular">丸いアイコンで表示</string>
-    <string name="title_advanced_color_saturation">彩度</string>
-    <string name="title_advanced_color_value">明度</string>
-    <string name="title_advanced_color_threshold">閾値の文字色</string>
    <string name="title_advanced_name_email">名前とメールアドレスを表示</string>
    <string name="title_advanced_replace_name">送信名より連絡先名を優先する</string>
    <string name="title_advanced_distinguish_contacts">送信者がローカル(宛先)連絡先として知られている場合、送信者に下線を引く</string>
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@ -220,7 +220,7 @@
    <string name="title_setup_reset_questions">Vragen resetten</string>
    <string name="title_advanced_hint_title">Meer geavanceerde opties</string>
    <string name="title_advanced_hint_message">        U navigeert naar de meer geavanceerde opties.
-        Alle opties hebben veelgebruikte standaardwaarden die kunnen, maar niet hoeven te worden gewijzigd als u een andere voorkeur heeft.
+        Alle opties hebben vaak gebruikte standaardwaarden die je niet hoeft te wijzigen tenzij je een andere voorkeur hebt.
    </string>
    <string name="title_advanced_section_main">Hoofd</string>
    <string name="title_advanced_section_synchronize">Ontvangen</string>
@ -307,9 +307,9 @@
    <string name="title_advanced_generated_icons">Toon gegenereerde iconen</string>
    <string name="title_advanced_identicons">Toon identicons</string>
    <string name="title_advanced_circular">Toon ronde iconen</string>
-    <string name="title_advanced_color_saturation">Verzadiging</string>
-    <string name="title_advanced_color_value">Helderheid</string>
-    <string name="title_advanced_color_threshold">Drempel letterkleur</string>
+    <string name="title_advanced_color_saturation">Verzadiging: %1$s %%</string>
+    <string name="title_advanced_color_value">Helderheid: %1$s %%</string>
+    <string name="title_advanced_color_threshold">Drempel letterkleur: %1$s %%</string>
    <string name="title_advanced_name_email">Toon namen en e-mailadressen</string>
    <string name="title_advanced_replace_name">Geef de voorkeur aan een contactnaam boven een verzonden naam</string>
    <string name="title_advanced_distinguish_contacts">Onderstreep de afzender wanneer de afzender bekend staat als lokaal \'aan\'-contact</string>
@ -442,6 +442,8 @@
    <string name="title_advanced_fts">Zoekindex opbouwen</string>
    <string name="title_advanced_fts_indexed">%1$d / %2$d berichten geïndexeerd (%3$s)</string>
    <string name="title_advanced_classification">Berichten classificeren</string>
+    <string name="title_advanced_class_min_chance" comment="title_advanced_class_min_chance&#10;Minimum chance for classifier to consider a class&#10;Please leave the format specifiers &quot;%1$s %%&quot;">Minimale klassekans: %1$s %%</string>
+    <string name="title_advanced_class_min_difference" comment="title_advanced_class_min_difference&#10;Minimum difference with next class for classifier to consider a class&#10;Please leave the format specifiers &quot;%1$s %%&quot;">Minimale klasseverschil: %1$s %%</string>
    <string name="title_advanced_language">Taal</string>
    <string name="title_advanced_language_system">Systeem</string>
    <string name="title_advanced_watchdog">Periodiek controleren of FairEmail nog actief is</string>
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@ -303,9 +303,6 @@
    <string name="title_advanced_generated_icons">Vis genererte ikoner</string>
    <string name="title_advanced_identicons">Vis identicons</string>
    <string name="title_advanced_circular">Vis runde ikoner</string>
-    <string name="title_advanced_color_saturation">Metning</string>
-    <string name="title_advanced_color_value">Lysstyrke</string>
-    <string name="title_advanced_color_threshold">Terskelbokstavfarge</string>
    <string name="title_advanced_name_email">Vis navn og e-postadresser</string>
    <string name="title_advanced_replace_name">Foretrekker et kontaktnavn fremfor et sendt navn</string>
    <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@ -303,9 +303,6 @@
    <string name="title_advanced_generated_icons">Vis genererte ikoner</string>
    <string name="title_advanced_identicons">Vis identicons</string>
    <string name="title_advanced_circular">Vis runde ikoner</string>
-    <string name="title_advanced_color_saturation">Metning</string>
-    <string name="title_advanced_color_value">Lysstyrke</string>
-    <string name="title_advanced_color_threshold">Terskelbokstavfarge</string>
    <string name="title_advanced_name_email">Vis navn og e-postadresser</string>
    <string name="title_advanced_replace_name">Foretrekker et kontaktnavn fremfor et sendt navn</string>
    <string name="title_advanced_distinguish_contacts">Understreke avsenderen når avsenderen er kjent som lokal \'til\' -kontakt</string>
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@ -241,9 +241,6 @@
    <string name="title_setup_defaults">Przywróć domyślne</string>
    <string name="title_setup_reset_questions">Zresetuj pytania</string>
    <string name="title_advanced_hint_title">Ustawienia zaawansowane</string>
-    <string name="title_advanced_hint_message">        Przechodzisz do bardziej zaawansowanych opcji.
-        Wszystkie opcje mają powszechnie używane wartości standardowe, których nie trzeba, ale można zmieniać, jeśli masz inne preferencje.
-    </string>
    <string name="title_advanced_section_main">Główne</string>
    <string name="title_advanced_section_synchronize">Odbieranie</string>
    <string name="title_advanced_section_send">Wysyłanie</string>
@ -329,9 +326,6 @@
    <string name="title_advanced_generated_icons">Pokaż wygenerowane ikony</string>
    <string name="title_advanced_identicons">Pokaż ikony kontaktów</string>
    <string name="title_advanced_circular">Pokaż okrągłe ikony</string>
-    <string name="title_advanced_color_saturation">Nasycenie</string>
-    <string name="title_advanced_color_value">Jasność</string>
-    <string name="title_advanced_color_threshold">Próg koloru czcionki</string>
    <string name="title_advanced_name_email">Pokaż nazwy i adresy e-mail</string>
    <string name="title_advanced_replace_name">Preferuj nazwę kontaktu nad nazwą wysłaną</string>
    <string name="title_advanced_distinguish_contacts">Podkreśl nadawcę, gdy znany jest jako lokalny kontakt „do”</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@ -289,9 +289,6 @@
    <string name="title_advanced_generated_icons">Mostrar ícones gerados</string>
    <string name="title_advanced_identicons">Mostrar identicons</string>
    <string name="title_advanced_circular">Mostrar ícones redondos</string>
-    <string name="title_advanced_color_saturation">Saturação</string>
-    <string name="title_advanced_color_value">Brilho</string>
-    <string name="title_advanced_color_threshold">Limite da cor da carta</string>
    <string name="title_advanced_name_email">Mostrar os nomes e endereços de e-mail</string>
    <string name="title_advanced_replace_name">Preferir um nome de contato sobre um nome enviado</string>
    <string name="title_advanced_distinguish_contacts">Sublinhar o remetente quando o remetente é conhecido como contato local \'para\'</string>
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@ -280,9 +280,6 @@
    <string name="title_advanced_generated_icons">Mostrar ícones gerados</string>
    <string name="title_advanced_identicons">Mostrar Identicons</string>
    <string name="title_advanced_circular">Mostrar ícones redondos</string>
-    <string name="title_advanced_color_saturation">Saturação</string>
-    <string name="title_advanced_color_value">Luminosidade</string>
-    <string name="title_advanced_color_threshold">Cor de limite de letra</string>
    <string name="title_advanced_name_email">Mostrar nomes e endereços de e-mail</string>
    <string name="title_advanced_replace_name">Preferir um nome de contato sobre um nome enviado</string>
    <string name="title_advanced_distinguish_contacts">Sublinhar o remetente quando o remetente é conhecido como contato local \'para\'</string>
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@ -230,9 +230,6 @@
    <string name="title_setup_defaults">Restabiliți valorile implicite</string>
    <string name="title_setup_reset_questions">Resetare întrebări</string>
    <string name="title_advanced_hint_title">Opțiuni și mai avansate</string>
-    <string name="title_advanced_hint_message">        Navigați la opțiunile mai avansate.
-        Toate opțiunile au folosit în mod obișnuit valori standard care pot dar nu trebuie să fie modificate dacă aveți o preferință diferită.
-    </string>
    <string name="title_advanced_section_main">Principal</string>
    <string name="title_advanced_section_synchronize">Primire</string>
    <string name="title_advanced_section_send">Trimitere</string>
@ -318,9 +315,6 @@
    <string name="title_advanced_generated_icons">Arată pictograme cu literă</string>
    <string name="title_advanced_identicons">Arată pictograme generate pe baza identității</string>
    <string name="title_advanced_circular">Arată pictograme rotunde</string>
-    <string name="title_advanced_color_saturation">Saturație</string>
-    <string name="title_advanced_color_value">Luminozitate</string>
-    <string name="title_advanced_color_threshold">Limită culoare literă</string>
    <string name="title_advanced_name_email">Arată nume și adrese de e-mail</string>
    <string name="title_advanced_replace_name">Preferă nume contact în loc de nume trimis</string>
    <string name="title_advanced_distinguish_contacts">Subliniază expeditorul atunci când este cunoscut drept un contact `către`</string>
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@ -243,7 +243,7 @@
    <string name="title_setup_reset_questions">Заново включить вопросы</string>
    <string name="title_advanced_hint_title">Настройки для опытных</string>
    <string name="title_advanced_hint_message">        Вы переходите к настройкам для опытных пользователей.
-        Все параметры обычно имеют стандартные значения, которые можно (но не нужно) изменить, если у вас есть другие предпочтения.
+        Все параметры обычно имеют стандартные значения, которые можно изменить, если у вас есть другие предпочтения.
    </string>
    <string name="title_advanced_section_main">Основные</string>
    <string name="title_advanced_section_synchronize">Получение</string>
@ -330,9 +330,6 @@
    <string name="title_advanced_generated_icons">Показывать сгенерированные значки</string>
    <string name="title_advanced_identicons">Показывать идентификаторы</string>
    <string name="title_advanced_circular">Использовать круглые значки</string>
-    <string name="title_advanced_color_saturation">Насыщенность</string>
-    <string name="title_advanced_color_value">Яркость</string>
-    <string name="title_advanced_color_threshold">Порог яркости отображения букв</string>
    <string name="title_advanced_name_email">Показывать имена и адреса электронной почты</string>
    <string name="title_advanced_replace_name">Предпочитать имя контакта вместо имени отправителя</string>
    <string name="title_advanced_distinguish_contacts">Подчёркивать отправителя, если он известен как локальный контакт \"Кому\"</string>
@ -1154,7 +1151,7 @@
    <string name="title_legend_encrypted">Зашифровано</string>
    <string name="title_legend_auth">Ошибка аутентификации</string>
    <string name="title_legend_found">Найден</string>
-    <string name="title_legend_classified">Был автоматически классифицирован</string>
+    <string name="title_legend_classified">Было автоматически классифицировано</string>
    <string name="title_legend_snoozed">Отложено</string>
    <string name="title_legend_browsed">Сообщение на сервере</string>
    <string name="title_legend_answered">Был дан ответ</string>
@ -1222,7 +1219,7 @@
    <string name="title_hint_message_selection">Длительное нажатие на сообщение начинает выбор нескольких сообщений; удерживайте нажатие и смахните вверх или вниз, чтобы выбрать больше сообщений.</string>
    <string name="title_hint_important">Важно</string>
    <string name="title_hint_sync">Загрузка сообщений может занять некоторое время в зависимости от скорости провайдера, интернет-соединения и устройства, а также от количества сообщений. Во время загрузки сообщений приложение может реагировать медленнее.</string>
-    <string name="title_hint_sync_note">По умолчанию, не все сообщения будут загружены для ограничения использования места в хранилище, заряда батареи и трафика. Это можно изменить, удерживая папку в списке папок и выбрав «Синхронизировать еще».</string>
+    <string name="title_hint_sync_note">По умолчанию, не все сообщения будут загружены для ограничения использования места в хранилище, заряда батареи и трафика. Это можно изменить, удерживая папку в списке папок и выбрав \"Синхронизировать ещё\".</string>
    <string name="title_hint_battery">Поскольку FairEmail по умолчанию всегда получает сообщения, Android считает его всё время активным. Поэтому может показаться, что FairEmail всегда использует батарею, хотя на самом деле это не так.</string>
    <string name="title_hint_reformat">По умолчанию FairEmail переформатирует сообщения по соображениям конфиденциальности и безопасности. Чтобы просмотреть исходное сообщение, нажмите значок \"полный экран\" над текстом сообщения.</string>
    <string name="title_hint_design">Дизайн преднамеренно не отвлекающий, но сохраняет высокую функциональность. Существует множество вариантов для настройки внешнего вида, но пожалуйста, поймите, что невозможно сделать всех полностью счастливыми одновременно.</string>
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@ -241,9 +241,6 @@
    <string name="title_setup_defaults">Obnoviť predvolené</string>
    <string name="title_setup_reset_questions">Obnoviť otázky</string>
    <string name="title_advanced_hint_title">Pokročilejšie nastavenia</string>
-    <string name="title_advanced_hint_message">        Vstupujete do pokročilejších možností.
-        Všetky možnosti majú nastavené bežne používané štandardné hodnoty, ktoré nemusíte meniť, jedine že je to podľa vašich preferencií.
-    </string>
    <string name="title_advanced_section_main">Základné</string>
    <string name="title_advanced_section_synchronize">Prijímanie správ</string>
    <string name="title_advanced_section_send">Posielanie správ</string>
@ -329,9 +326,6 @@
    <string name="title_advanced_generated_icons">Zobraziť generované ikonky</string>
    <string name="title_advanced_identicons">Zobraziť identikony</string>
    <string name="title_advanced_circular">Zobraziť okrúhle ikonky</string>
-    <string name="title_advanced_color_saturation">Saturácia</string>
-    <string name="title_advanced_color_value">Jas</string>
-    <string name="title_advanced_color_threshold">Prahová hodnota farby písma</string>
    <string name="title_advanced_name_email">Zobraziť mená a e-mailové adresy</string>
    <string name="title_advanced_replace_name">Uprednostňovať mená z kontaktov pred menami zo správy</string>
    <string name="title_advanced_distinguish_contacts">Podčiarknúť odosielateľa ak je v miestnych kontaktoch</string>
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@ -271,9 +271,6 @@
    <string name="title_advanced_generated_icons">Prikaži ustvarjene ikone</string>
    <string name="title_advanced_identicons">Prikaži identitetne ikone</string>
    <string name="title_advanced_circular">Prikaži okrogle ikone</string>
-    <string name="title_advanced_color_saturation">Nasičenost</string>
-    <string name="title_advanced_color_value">Svetlost</string>
-    <string name="title_advanced_color_threshold">Prag barve črke</string>
    <string name="title_advanced_name_email">Prikaži imena in e-poštne naslove</string>
    <string name="title_advanced_replace_name">Prednost ima ime stika pred poslanim imenom</string>
    <string name="title_advanced_distinguish_contacts">Podčrtaj pošiljatelja, ko je ta poznan kot krajevni stik \'Za\'</string>
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@ -220,9 +220,6 @@
    <string name="title_advanced_generated_icons">Прикажи генерисане иконице</string>
    <string name="title_advanced_identicons">Прикажи иденти-иконице</string>
    <string name="title_advanced_circular">Прикажи заобљене иконице</string>
-    <string name="title_advanced_color_saturation">Засићеност</string>
-    <string name="title_advanced_color_value">Осветљеност</string>
-    <string name="title_advanced_color_threshold">Ниво окидања за боју слова</string>
    <string name="title_advanced_name_email">Прикажи имена и е-мејл адресе</string>
    <string name="title_advanced_subject_top">Прикажи наслов изнад пошиљаоца</string>
    <string name="title_advanced_subject_italic">Прикажи наслов курзивом</string>
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@ -220,8 +220,6 @@
    <string name="title_setup_defaults">Återställ standardvärden</string>
    <string name="title_setup_reset_questions">Återställ frågor</string>
    <string name="title_advanced_hint_title">Mer avancerade alternativ</string>
-    <string name="title_advanced_hint_message">Du navigerar till de mer avancerade alternativen.
-        Alla alternativ har använt standardvärden som kan ändras om du har en annan inställning.    </string>
    <string name="title_advanced_section_main">Huvudsaklig</string>
    <string name="title_advanced_section_synchronize">Ta emot</string>
    <string name="title_advanced_section_send">Skicka</string>
@ -307,9 +305,6 @@
    <string name="title_advanced_generated_icons">Visa genererade ikoner</string>
    <string name="title_advanced_identicons">Visa identicons</string>
    <string name="title_advanced_circular">Visa runda ikoner</string>
-    <string name="title_advanced_color_saturation">Mättnad</string>
-    <string name="title_advanced_color_value">Ljusstyrka</string>
-    <string name="title_advanced_color_threshold">Tröskelbokstavsfärg</string>
    <string name="title_advanced_name_email">Visa namn och e-postadresser</string>
    <string name="title_advanced_replace_name">Föredrar ett kontaktnamn över ett skickat namn</string>
    <string name="title_advanced_distinguish_contacts">Understryk avsändaren när avsändaren är känd som lokal \"till\" kontakt</string>
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@ -302,9 +302,6 @@
    <string name="title_advanced_generated_icons">Oluşturulan simgeleri göster</string>
    <string name="title_advanced_identicons">Kimliklerini göster</string>
    <string name="title_advanced_circular">Yuvarlak simgeleri göster</string>
-    <string name="title_advanced_color_saturation">Renk doygunluğu</string>
-    <string name="title_advanced_color_value">Parlaklık</string>
-    <string name="title_advanced_color_threshold">Eşik harf rengi</string>
    <string name="title_advanced_name_email">Adları ve e-posta adreslarini göster</string>
    <string name="title_advanced_replace_name">Gönderilen ad yerine kişi adı tercih et</string>
    <string name="title_advanced_distinguish_contacts">Gönderen yerel \'alıcı\' kişisi olarak biliniyorsa gönderenin altını çiz</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@ -66,7 +66,7 @@
    <string name="title_block_sender_hint">        拉黑某发件人将创建一条规则来自动将未来消息移动至垃圾邮件文件夹
        创建和使用规则属于专业版功能</string>
    <string name="title_junk_filter">使用本地垃圾邮件过滤器</string>
-    <string name="title_junk_filter_hint">这可能会增加电池使用量并错误地将消息标记为垃圾信息</string>
+    <string name="title_junk_filter_hint">这可能会增加耗电量并误标为垃圾邮件</string>
    <string name="title_notification_sending">正在发送消息</string>
    <string name="title_notification_waiting">等待网络连接</string>
    <string name="title_notification_idle">空闲</string>
@ -208,8 +208,9 @@
    <string name="title_setup_defaults">恢复默认设置</string>
    <string name="title_setup_reset_questions">重置问题</string>
    <string name="title_advanced_hint_title">更多高级选项</string>
-    <string name="title_advanced_hint_message">        您正在导航到更高级的选项。
-        所有选项都使用了常用的标准值。如果您有不同的偏好，可以更改它们，但没有这个必要。    </string>
+    <string name="title_advanced_hint_message">        您正在前往更多的高级选项
+        所有选项默认均使用可更改的常用标准值
+    </string>
    <string name="title_advanced_section_main">主要</string>
    <string name="title_advanced_section_synchronize">接收</string>
    <string name="title_advanced_section_send">发送</string>
@ -295,9 +296,6 @@
    <string name="title_advanced_generated_icons">显示生成的图标</string>
    <string name="title_advanced_identicons">显示哈希头像</string>
    <string name="title_advanced_circular">使用圆形图标</string>
-    <string name="title_advanced_color_saturation">饱和度</string>
-    <string name="title_advanced_color_value">亮度</string>
-    <string name="title_advanced_color_threshold">阈值字母颜色</string>
    <string name="title_advanced_name_email">显示名称和电子邮件地址</string>
    <string name="title_advanced_replace_name">优先使用联系人姓名而不是发送名称</string>
    <string name="title_advanced_distinguish_contacts">下划线发件人(当其为本地发送给的联系人时)</string>
@ -1187,7 +1185,7 @@
    <string name="title_hint_message_selection">长按进行多选；按住的同时并上下滑动可选择多个邮件</string>
    <string name="title_hint_important">重要</string>
    <string name="title_hint_sync">下载邮件可能需要一些时间, 具体取决于提供商的速度、网络连接、设备以及邮件数量。在下载邮件时, 应用的响应速度可能会变慢。</string>
-    <string name="title_hint_sync_note">默认情况下，本应用不会下载所有的消息，以限制存储空间、电池和数据的使用。你可以通过长按文件夹列表中的文件夹并选择“同步更多”来改变这一点。</string>
+    <string name="title_hint_sync_note">默认情况下，本应用不会下载所有的消息，以减少存储空间、电量和流量的使用。当然，您可以通过长按文件夹列表中的相应文件夹，并选择弹出菜单的 \"同步更多\" 来改变这一点</string>
    <string name="title_hint_battery">由于FairEmail默认总是接受消息，安卓系统会报告FE始终处于活动状态。 因此，FE看起来好像总在耗电，但事实上情况并非如此。</string>
    <string name="title_hint_reformat">默认情况下，FairEmail 会基于隐私和安全原因重新格式化消息。要查看原始消息，请点击消息文本上方的“全屏”图标</string>
    <string name="title_hint_design">FE 的设计理念旨在不让用户分散注意力，重在实用性。而且设置中已经有很多自定义外观的选项，请谅解，我很难同时让所有人都满意</string>
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@ -289,9 +289,6 @@
    <string name="title_advanced_generated_icons">顯示設定的圖示</string>
    <string name="title_advanced_identicons">顯示身份</string>
    <string name="title_advanced_circular">顯示圓形圖示</string>
-    <string name="title_advanced_color_saturation">飽和度</string>
-    <string name="title_advanced_color_value">亮度</string>
-    <string name="title_advanced_color_threshold">字母顏色閥值</string>
    <string name="title_advanced_name_email">顯示名字及郵件地址</string>
    <string name="title_advanced_replace_name">偏好顯示聯絡人名字而不是寄件人名字</string>
    <string name="title_advanced_distinguish_contacts">當寄件人為本機聯絡人時將名字加註底線</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -371,9 +371,9 @@
    <string name="title_advanced_generated_icons">Show generated icons</string>
    <string name="title_advanced_identicons">Show identicons</string>
    <string name="title_advanced_circular">Show round icons</string>
-    <string name="title_advanced_color_saturation">Saturation</string>
-    <string name="title_advanced_color_value">Brightness</string>
-    <string name="title_advanced_color_threshold">Threshold letter color</string>
+    <string name="title_advanced_color_saturation">Saturation: %1$s %%</string>
+    <string name="title_advanced_color_value">Brightness: %1$s %%</string>
+    <string name="title_advanced_color_threshold">Threshold letter color: %1$s %%</string>
    <string name="title_advanced_name_email">Show names and email addresses</string>
    <string name="title_advanced_replace_name">Prefer a contact name over a sent name</string>
    <string name="title_advanced_distinguish_contacts">Underline the sender when the sender is known as local \'to\' contact</string>
--- a/docs/FAQ-de-rAT.md
+++ b/docs/FAQ-de-rAT.md
@ -226,7 +226,7 @@ Das Design basiert auf vielen Diskussionen und wenn du möchtest, kannst du auch
 * [(105) Wie funktioniert die »Roaming wie zu Hause«-Option?](#user-content-faq105)
 * [(106) Welche Launcher können die Anzahl der ungelesenen Nachrichten als Plakette anzeigen?](#user-content-faq106)
 * [(107) Wie verwende ich farbige Sterne?](#user-content-faq107)
-* [~~(108) Can you add permanently delete messages from any folder?~~](#user-content-faq108)
+* [~~(108) Kann man Nachrichten aus beliebigen Ordnern dauerhaft löschen?~~](#user-content-faq108)
 * [~~(109) Warum ist »Konto auswählen« nur in offiziellen Versionen verfügbar?~~](#user-content-faq109)
 * [(110) Warum sind (einige) Nachrichten leer und/oder Anhänge beschädigt?](#user-content-faq110)
 * [(111) Wird OAuth unterstützt?](#user-content-faq111)
--- a/docs/FAQ-de-rDE.md
+++ b/docs/FAQ-de-rDE.md
@ -226,7 +226,7 @@ Das Design basiert auf vielen Diskussionen und wenn du möchtest, kannst du auch
 * [(105) Wie funktioniert die »Roaming wie zu Hause«-Option?](#user-content-faq105)
 * [(106) Welche Launcher können die Anzahl der ungelesenen Nachrichten als Plakette anzeigen?](#user-content-faq106)
 * [(107) Wie verwende ich farbige Sterne?](#user-content-faq107)
-* [~~(108) Can you add permanently delete messages from any folder?~~](#user-content-faq108)
+* [~~(108) Kann man Nachrichten aus beliebigen Ordnern dauerhaft löschen?~~](#user-content-faq108)
 * [~~(109) Warum ist »Konto auswählen« nur in offiziellen Versionen verfügbar?~~](#user-content-faq109)
 * [(110) Warum sind (einige) Nachrichten leer und/oder Anhänge beschädigt?](#user-content-faq110)
 * [(111) Wird OAuth unterstützt?](#user-content-faq111)
--- a/docs/FAQ-de-rLI.md
+++ b/docs/FAQ-de-rLI.md
@ -226,7 +226,7 @@ Das Design basiert auf vielen Diskussionen und wenn du möchtest, kannst du auch
 * [(105) Wie funktioniert die »Roaming wie zu Hause«-Option?](#user-content-faq105)
 * [(106) Welche Launcher können die Anzahl der ungelesenen Nachrichten als Plakette anzeigen?](#user-content-faq106)
 * [(107) Wie verwende ich farbige Sterne?](#user-content-faq107)
-* [~~(108) Can you add permanently delete messages from any folder?~~](#user-content-faq108)
+* [~~(108) Kann man Nachrichten aus beliebigen Ordnern dauerhaft löschen?~~](#user-content-faq108)
 * [~~(109) Warum ist »Konto auswählen« nur in offiziellen Versionen verfügbar?~~](#user-content-faq109)
 * [(110) Warum sind (einige) Nachrichten leer und/oder Anhänge beschädigt?](#user-content-faq110)
 * [(111) Wird OAuth unterstützt?](#user-content-faq111)