From 70f2c25fb94b88c19dafd3a44fd8b88a8fd05210 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Mon, 29 Jun 2020 08:17:17 +0200
Subject: [PATCH] Crowdin sync

---
 app/src/main/res/values-ar-rBH/strings.xml |  1 -
 app/src/main/res/values-ar-rEG/strings.xml |  1 -
 app/src/main/res/values-ar-rYE/strings.xml |  1 -
 app/src/main/res/values-az-rAZ/strings.xml |  1 -
 app/src/main/res/values-bg-rBG/strings.xml |  7 ------
 app/src/main/res/values-ca-rES/strings.xml |  9 ++------
 app/src/main/res/values-cs-rCZ/strings.xml | 15 +++++++------
 app/src/main/res/values-da-rDK/strings.xml | 24 ++++++++++++++------
 app/src/main/res/values-de-rDE/strings.xml | 26 +++++++++++++++-------
 app/src/main/res/values-el-rGR/strings.xml |  1 -
 app/src/main/res/values-en-rGB/strings.xml |  3 ---
 app/src/main/res/values-es-rES/strings.xml | 26 +++++++++++++++-------
 app/src/main/res/values-eu-rES/strings.xml |  7 ------
 app/src/main/res/values-fa-rIR/strings.xml |  6 -----
 app/src/main/res/values-fi-rFI/strings.xml | 11 ++++-----
 app/src/main/res/values-fr-rCA/strings.xml | 22 +++++++++++++-----
 app/src/main/res/values-fr-rFR/strings.xml | 22 +++++++++++++-----
 app/src/main/res/values-fy-rNL/strings.xml |  2 --
 app/src/main/res/values-hr-rHR/strings.xml |  6 -----
 app/src/main/res/values-hu-rHU/strings.xml |  7 ------
 app/src/main/res/values-it-rIT/strings.xml | 24 ++++++++++++++------
 app/src/main/res/values-iw-rIL/strings.xml |  3 +--
 app/src/main/res/values-ja-rJP/strings.xml |  7 ------
 app/src/main/res/values-nl-rNL/strings.xml | 24 ++++++++++++++------
 app/src/main/res/values-nn-rNO/strings.xml |  6 -----
 app/src/main/res/values-no-rNO/strings.xml |  6 -----
 app/src/main/res/values-pl-rPL/strings.xml | 22 +++++++++++++-----
 app/src/main/res/values-pt-rBR/strings.xml |  7 ------
 app/src/main/res/values-pt-rPT/strings.xml |  4 ----
 app/src/main/res/values-ro-rRO/strings.xml |  7 ------
 app/src/main/res/values-ru-rRU/strings.xml | 22 +++++++++++++-----
 app/src/main/res/values-sl-rSI/strings.xml |  6 -----
 app/src/main/res/values-sr-rSP/strings.xml |  5 -----
 app/src/main/res/values-sv-rSE/strings.xml | 24 ++++++++++++++------
 app/src/main/res/values-tr-rTR/strings.xml |  6 -----
 app/src/main/res/values-zh-rCN/strings.xml | 24 ++++++++++++++------
 app/src/main/res/values-zh-rTW/strings.xml |  4 ----
 37 files changed, 200 insertions(+), 199 deletions(-)

diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 2feb524253..9c8d1bd13f 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -264,7 +264,6 @@
     <string name="title_style_bold">غليظ</string>
     <string name="title_style_italic">مائل</string>
     <string name="title_style_size">الحجم</string>
-    <string name="title_style_color">اللون</string>
     <string name="title_style_link">إدراج رابط</string>
     <string name="title_add_attachment">إضافة مرفق</string>
     <string name="title_attachment_file">إرفاق ملف</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 2feb524253..9c8d1bd13f 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -264,7 +264,6 @@
     <string name="title_style_bold">غليظ</string>
     <string name="title_style_italic">مائل</string>
     <string name="title_style_size">الحجم</string>
-    <string name="title_style_color">اللون</string>
     <string name="title_style_link">إدراج رابط</string>
     <string name="title_add_attachment">إضافة مرفق</string>
     <string name="title_attachment_file">إرفاق ملف</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 6140dd73c1..bf4acf12ed 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -329,7 +329,6 @@
     <string name="title_style_bold">غليظ</string>
     <string name="title_style_italic">مائل</string>
     <string name="title_style_size">الحجم</string>
-    <string name="title_style_color">اللون</string>
     <string name="title_style_link">إدراج رابط</string>
     <string name="title_add_attachment">إضافة مرفق</string>
     <string name="title_attachment_file">إرفاق ملف</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index f05b88a631..0295ed8a4e 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -172,7 +172,6 @@
     <string name="title_advanced_preview">Mesaj ilkin baxışını göstər</string>
     <string name="title_advanced_addresses">Ünvan təfsilatlarını ilkin olaraq göstər</string>
     <string name="title_advanced_attachments_alt">Mesaj mətnindən sonra qoşmaları göstər</string>
-    <string name="title_advanced_monospaced">Mesaj mətni üçün tək boşluqlu yazı növü istifadə et</string>
     <string name="title_advanced_pull_refresh">Təzələmək üçün aşağı çəkin</string>
     <string name="title_advanced_autoscroll">Yeni mesajları almaq üçün yuxarı sürüşdür</string>
     <string name="title_advanced_swipenav">Sonrakı/əvvəlki danışığa getmək üçün sola/sağa sürüşdürün</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index 5ed684f939..ff4dd03a50 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -302,10 +302,6 @@
     <string name="title_advanced_addresses">Покажи адреса по подразбиране</string>
     <string name="title_advanced_attachments_alt">Покажи прикачените файлове след текста на съобщението</string>
     <string name="title_advanced_contrast">Използвай висок контраст за текст на съобщението</string>
-    <string name="title_advanced_monospaced">Използвай шрифт с еднакъв размер за текст на съобщението</string>
-    <string name="title_advanced_text_color">Покажи текста с цветове</string>
-    <string name="title_advanced_text_size">Показвайте малки и големи текстове</string>
-    <string name="title_advanced_text_align">Показване на подравнени текстове вляво/в центъра/вдясно</string>
     <string name="title_advanced_collapse_quotes">Свиване на цитирания текст</string>
     <string name="title_advanced_images_inline">Автоматично показване на вградени изображения</string>
     <string name="title_advanced_seekbar">Покажи позицията на разговора с точка</string>
@@ -753,7 +749,6 @@
     <string name="title_style_italic">Наклонен</string>
     <string name="title_style_underline">Подчертан</string>
     <string name="title_style_size">Големина</string>
-    <string name="title_style_color">Цвят</string>
     <string name="title_style_clear">Изчистване на форматирането</string>
     <string name="title_style_link">Вмъкване на връзка</string>
     <string name="title_add_image">Добавяне на изображение</string>
@@ -1019,8 +1014,6 @@
     <string name="title_legend_bold">Удебелен текст</string>
     <string name="title_legend_italic">Наклонен текст</string>
     <string name="title_legend_underline">Подчертан текст</string>
-    <string name="title_legend_text_size">Размер на текста</string>
-    <string name="title_legend_text_color">Избери цвят на текста</string>
     <string name="title_legend_metered">Измервана връзка</string>
     <string name="title_legend_unmetered">Неизмервана връзка</string>
     <string name="title_legend_roaming">Роуминг</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index f3e023f89e..398343ab29 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -296,10 +296,6 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_advanced_addresses">Mostra els detalls de les adreces per defecte</string>
     <string name="title_advanced_attachments_alt">Mostra fitxers adjunts després del text del missatge</string>
     <string name="title_advanced_contrast">Utilitzeu un alt contrast per al text del missatge</string>
-    <string name="title_advanced_monospaced">Utilitzeu tipus de lletra mono per al text del missatge</string>
-    <string name="title_advanced_text_color">Mostra els colors del text</string>
-    <string name="title_advanced_text_size">Mostrar textos petits i grans</string>
-    <string name="title_advanced_text_align">Mostra els textos alineats a l\'esquerra/al centre/a la dreta</string>
     <string name="title_advanced_collapse_quotes">Aplega el text citat</string>
     <string name="title_advanced_images_inline">Mostra automàticament imatges en línia</string>
     <string name="title_advanced_seekbar">Mostra la posició de conversa relativa amb un punt</string>
@@ -740,7 +736,8 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_style_italic">Cursiva</string>
     <string name="title_style_underline">Subratllat</string>
     <string name="title_style_size">Mida</string>
-    <string name="title_style_color">Color</string>
+    <string name="title_style_font">Font</string>
+    <string name="title_style_color">Color &#8230;</string>
     <string name="title_style_clear">Esborra el format</string>
     <string name="title_style_link">Insereix enllaç</string>
     <string name="title_add_image">Afegir una imatge</string>
@@ -986,8 +983,6 @@ La creació i l\'ús de regles és una característica professional.    </string
     <string name="title_legend_bold">Fes negreta el text</string>
     <string name="title_legend_italic">Fes cursiva el text</string>
     <string name="title_legend_underline">Text subratllat</string>
-    <string name="title_legend_text_size">Definiu la mida del text</string>
-    <string name="title_legend_text_color">Definiu el color del text</string>
     <string name="title_legend_metered">La connexió és mesurada</string>
     <string name="title_legend_unmetered">La connexió no es mesurada</string>
     <string name="title_legend_roaming">Itinerància</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 7db802fdc9..5a55f9e3ba 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -326,10 +326,11 @@
     <string name="title_advanced_addresses">Zobrazit detaily adresy automaticky</string>
     <string name="title_advanced_attachments_alt">Přesunout zobrazení příloh pod text zprávy</string>
     <string name="title_advanced_contrast">Použít vysoký kontrast pro text zprávy</string>
-    <string name="title_advanced_monospaced">Použít neproporcionální písmo pro text zprávy</string>
-    <string name="title_advanced_text_color">Zobrazit barvy textu</string>
-    <string name="title_advanced_text_size">Zobrazit malé a velké texty</string>
-    <string name="title_advanced_text_align">Zobrazit vlevo/na střed/vpravo zarovnané texty</string>
+    <string name="title_advanced_monospaced">Automaticky použít neproporcionální písmo pro text zprávy</string>
+    <string name="title_advanced_text_color">Použít barvy textu</string>
+    <string name="title_advanced_text_size">Použít velikost textu</string>
+    <string name="title_advanced_text_font">Použít fonty písma</string>
+    <string name="title_advanced_text_align">Použít zarovnání textu</string>
     <string name="title_advanced_collapse_quotes">Sbalit citovaný text</string>
     <string name="title_advanced_images_inline">Automaticky zobrazit vložené obrázky</string>
     <string name="title_advanced_seekbar">Zobrazit relativní pozici v konverzaci puntíkem</string>
@@ -782,7 +783,9 @@
     <string name="title_style_italic">Kurzíva</string>
     <string name="title_style_underline">Podtržení</string>
     <string name="title_style_size">Velikost</string>
-    <string name="title_style_color">Barva</string>
+    <string name="title_style_size_small">Malý</string>
+    <string name="title_style_size_medium">Střední</string>
+    <string name="title_style_size_large">Velký</string>
     <string name="title_style_clear">Vymazat formátování</string>
     <string name="title_style_link">Vložit odkaz</string>
     <string name="title_add_image">Přidat obrázek</string>
@@ -1048,8 +1051,6 @@
     <string name="title_legend_bold">Změnit text na tučný</string>
     <string name="title_legend_italic">Změnit text na kurzívu</string>
     <string name="title_legend_underline">Podtrhnout text</string>
-    <string name="title_legend_text_size">Nastavit velikost textu</string>
-    <string name="title_legend_text_color">Nastavit barvu textu</string>
     <string name="title_legend_metered">Současné připojení je účtováno</string>
     <string name="title_legend_unmetered">Současné připojení není účtováno</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 462b8032ce..fea0f78721 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -304,10 +304,11 @@
     <string name="title_advanced_addresses">Vis adresseoplysninger som standard</string>
     <string name="title_advanced_attachments_alt">Vis vedhæftninger efter beskedteksten</string>
     <string name="title_advanced_contrast">Benyt høj kontrast til beskedtekst</string>
-    <string name="title_advanced_monospaced">Benyt monospatieret skrifttype til beskedtekst</string>
-    <string name="title_advanced_text_color">Vis skriftfarver</string>
-    <string name="title_advanced_text_size">Vis små og store tekster</string>
-    <string name="title_advanced_text_align">Vis venstre-/højre-/centerjusteret tekster</string>
+    <string name="title_advanced_monospaced">Benyt som standard monospatieret skrifttype til beskedtekst</string>
+    <string name="title_advanced_text_color">Benyt tekstfarver</string>
+    <string name="title_advanced_text_size">Benyt tekststørrelser</string>
+    <string name="title_advanced_text_font">Benyt skrifttyper</string>
+    <string name="title_advanced_text_align">Benyt tekstjustering</string>
     <string name="title_advanced_collapse_quotes">Skjul citeret tekst</string>
     <string name="title_advanced_images_inline">Auto-vis indlejrede/vehæftede billeder</string>
     <string name="title_advanced_seekbar">Vis relativ samtaleposition med en prik</string>
@@ -756,11 +757,21 @@
     <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
     <string name="title_no_server">Ingen server fundet på \'%1$s\'</string>
+    <string name="title_style">Stil</string>
     <string name="title_style_bold">Fed</string>
     <string name="title_style_italic">Kursiv</string>
     <string name="title_style_underline">Understegning</string>
     <string name="title_style_size">Størrelse</string>
-    <string name="title_style_color">Farve</string>
+    <string name="title_style_size_small">Lille</string>
+    <string name="title_style_size_medium">Mellem</string>
+    <string name="title_style_size_large">Stor</string>
+    <string name="title_style_font">Skrifttype</string>
+    <string name="title_style_font_cursive">Kursiv</string>
+    <string name="title_style_font_serif">Serif</string>
+    <string name="title_style_font_sans_serif">Sans-serif</string>
+    <string name="title_style_font_monospace">Monospatieret</string>
+    <string name="title_style_font_default">Standard</string>
+    <string name="title_style_color">Farve &#8230;</string>
     <string name="title_style_clear">Ryd formatering</string>
     <string name="title_style_link">Indsæt link</string>
     <string name="title_add_image">Tilføj billede</string>
@@ -1026,8 +1037,7 @@
     <string name="title_legend_bold">Gør tekst fed</string>
     <string name="title_legend_italic">Gør tekst kursiv</string>
     <string name="title_legend_underline">Understreg tekst</string>
-    <string name="title_legend_text_size">Vælg skriftstørrelse</string>
-    <string name="title_legend_text_color">Vælg skriftfarve</string>
+    <string name="title_legend_text_style">Vælg tekststil</string>
     <string name="title_legend_metered">Forbindelse er forbrugsafregnet</string>
     <string name="title_legend_unmetered">Forbindelse er ikke-forbrugafregnet</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index c39f94849b..5dc55dfba0 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -305,10 +305,11 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_addresses">Adressdetails standardmäßig anzeigen</string>
     <string name="title_advanced_attachments_alt">Anhänge nach (statt vor) dem Nachrichtentext anzeigen</string>
     <string name="title_advanced_contrast">Hohen Kontrast für den Nachrichtentext verwenden</string>
-    <string name="title_advanced_monospaced">Unproportionale Schriftart für den Nachrichtentext verwenden</string>
-    <string name="title_advanced_text_color">Textfarben anzeigen</string>
-    <string name="title_advanced_text_size">Kleine und große Texte anzeigen</string>
-    <string name="title_advanced_text_align">links-/rechtsbündige/zentrierte Texte anzeigen</string>
+    <string name="title_advanced_monospaced">Unproportionale Schriftart standardmäßig für den Nachrichtentext verwenden</string>
+    <string name="title_advanced_text_color">Textfarben verwenden</string>
+    <string name="title_advanced_text_size">Textgrößen verwenden</string>
+    <string name="title_advanced_text_font">Schriftarten verwenden</string>
+    <string name="title_advanced_text_align">Textausrichtung verwenden</string>
     <string name="title_advanced_collapse_quotes">Zitierten Text ausblenden</string>
     <string name="title_advanced_images_inline">Eingebettete Grafiken automatisch anzeigen</string>
     <string name="title_advanced_seekbar">Relative Unterhaltungsposition mit einem Punkt kennzeichnen</string>
@@ -664,7 +665,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_spam">Spam</string>
     <string name="title_move">Verschieben</string>
     <string name="title_copy_btn">Kopieren</string>
-    <string name="title_unsubscribe">Aus Liste abmelden</string>
+    <string name="title_unsubscribe">Abbestellen</string>
     <string name="title_message_rule">Regel erstellen</string>
     <string name="title_no_junk">Kein Spam</string>
     <string name="title_move_to">Verschieben nach &#8230;</string>
@@ -756,11 +757,21 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_send_encryption">Verschlüsselung</string>
     <string name="title_send_priority">Priorität</string>
     <string name="title_no_server">Kein Server gefunden bei \'%1$s\'</string>
+    <string name="title_style">Stil</string>
     <string name="title_style_bold">Fett</string>
     <string name="title_style_italic">Kursiv</string>
     <string name="title_style_underline">Unterstreichen</string>
     <string name="title_style_size">Größe</string>
-    <string name="title_style_color">Farbe</string>
+    <string name="title_style_size_small">Klein</string>
+    <string name="title_style_size_medium">Mittel</string>
+    <string name="title_style_size_large">Groß</string>
+    <string name="title_style_font">Schriftart</string>
+    <string name="title_style_font_cursive">Kursiv</string>
+    <string name="title_style_font_serif">Serife</string>
+    <string name="title_style_font_sans_serif">Serifenlos</string>
+    <string name="title_style_font_monospace">Festbreitenschrift</string>
+    <string name="title_style_font_default">Standard</string>
+    <string name="title_style_color">Farbe &#8230;</string>
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link einfügen</string>
     <string name="title_add_image">Bild hinzufügen</string>
@@ -1024,8 +1035,7 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_legend_bold">Fett schreiben</string>
     <string name="title_legend_italic">Kursiv schreiben</string>
     <string name="title_legend_underline">Text unterstreichen</string>
-    <string name="title_legend_text_size">Textgröße festlegen</string>
-    <string name="title_legend_text_color">Textfarbe festlegen</string>
+    <string name="title_legend_text_style">Textstil verwenden</string>
     <string name="title_legend_metered">Verbindung ist getaktet</string>
     <string name="title_legend_unmetered">Verbindung ist ungetaktet</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index d0ad85b617..1685d84e91 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -238,7 +238,6 @@
     <string name="title_send_via">Αποστολή μέσω</string>
     <string name="title_no_server">Δε βρέθηκε διακομιστής στο \'%1$s\'</string>
     <string name="title_style_size">Μέγεθος</string>
-    <string name="title_style_color">Χρώμα</string>
     <string name="title_signature_certificate_invalid">Η αλυσίδα πιστοποιητικών δεν είναι έγκυρη</string>
     <string name="title_search_hint">        Η αναζήτηση αρχικά θα ψάξει μηνύματα που είναι αποθηκευμένα στη συσκευή.
         Για να ψάξετε και μηνύματα στο διακομιστή, πατήστε το κουμπί \'επανάληψη αναζήτησης\'.
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 3d0a965bda..733fcb8ad9 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -12,7 +12,6 @@
     <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">Show text colours</string>
     <string name="title_advanced_actionbar_color">Use account colour as background colour for conversation action bar</string>
     <string name="title_advanced_navbar_colorize">Colourise the Android navigation bar</string>
     <string name="title_advanced_notify_action_trash">Delete</string>
@@ -39,7 +38,6 @@
     <string name="title_folder_trash">Bin</string>
     <string name="title_flag_color">Coloured star &#8230;</string>
     <string name="title_trash">Delete</string>
-    <string name="title_style_color">Colour</string>
     <string name="title_legend_section_synchronize">Synchronise</string>
     <string name="title_legend_synchronize_on">Synchronise on</string>
     <string name="title_legend_synchronize_off">Synchronise off</string>
@@ -47,7 +45,6 @@
     <string name="title_legend_waiting">Waiting for next synchronisation</string>
     <string name="title_legend_trash">Bin</string>
     <string name="title_legend_sync_keep">Number of days to synchronise / to keep messages</string>
-    <string name="title_legend_text_color">Set text colour</string>
     <string name="title_legend_default_color">Default colour</string>
     <string name="title_legend_sync_state">Synchronisation state</string>
     <string name="title_legend_d">Delete</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 35bdc9dbb4..c962e44064 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -305,10 +305,11 @@
     <string name="title_advanced_addresses">Mostrar detalles de dirección por defecto</string>
     <string name="title_advanced_attachments_alt">Mostrar adjuntos después del texto del mensaje</string>
     <string name="title_advanced_contrast">Utilizar contraste alto para el texto del mensaje</string>
-    <string name="title_advanced_monospaced">Usar fuente monoespaciada para texto de mensaje</string>
-    <string name="title_advanced_text_color">Mostrar colores de texto</string>
-    <string name="title_advanced_text_size">Mostrar textos pequeños y grandes</string>
-    <string name="title_advanced_text_align">Mostrar textos alineados a la izquierda/centro/derecha</string>
+    <string name="title_advanced_monospaced">Usar fuente monospaciada para el texto del mensaje por defecto</string>
+    <string name="title_advanced_text_color">Usar colores de texto</string>
+    <string name="title_advanced_text_size">Usar tamaños de texto</string>
+    <string name="title_advanced_text_font">Usar fuentes</string>
+    <string name="title_advanced_text_align">Usar alineación de texto</string>
     <string name="title_advanced_collapse_quotes">Colapsar texto citado</string>
     <string name="title_advanced_images_inline">Mostrar imágenes embebidas automáticamente</string>
     <string name="title_advanced_seekbar">Mostrar posición relativa de conversación con un punto</string>
@@ -757,11 +758,21 @@
     <string name="title_send_encryption">Cifrado</string>
     <string name="title_send_priority">Prioridad</string>
     <string name="title_no_server">No se encontró ningún servidor en \'%1$s\'</string>
+    <string name="title_style">Estilo</string>
     <string name="title_style_bold">Negrita</string>
     <string name="title_style_italic">Cursiva</string>
     <string name="title_style_underline">Subrayado</string>
     <string name="title_style_size">Tamaño</string>
-    <string name="title_style_color">Color</string>
+    <string name="title_style_size_small">Pequeño</string>
+    <string name="title_style_size_medium">Mediano</string>
+    <string name="title_style_size_large">Grande</string>
+    <string name="title_style_font">Fuente</string>
+    <string name="title_style_font_cursive">Cursiva</string>
+    <string name="title_style_font_serif">Serif</string>
+    <string name="title_style_font_sans_serif">Sans-serif</string>
+    <string name="title_style_font_monospace">Monoespaciado</string>
+    <string name="title_style_font_default">Por defecto</string>
+    <string name="title_style_color">Color &#8230;</string>
     <string name="title_style_clear">Quitar formato</string>
     <string name="title_style_link">Insertar enlace</string>
     <string name="title_add_image">Añadir imagen</string>
@@ -1027,8 +1038,7 @@
     <string name="title_legend_bold">Cambiar texto a negrita</string>
     <string name="title_legend_italic">Cambiar texto a cursiva</string>
     <string name="title_legend_underline">Subrayar texto</string>
-    <string name="title_legend_text_size">Establecer tamaño de texto</string>
-    <string name="title_legend_text_color">Establecer color de texto</string>
+    <string name="title_legend_text_style">Establecer estilo de texto</string>
     <string name="title_legend_metered">Conexión medida</string>
     <string name="title_legend_unmetered">Conexión no medida</string>
     <string name="title_legend_roaming">Itinerancia</string>
@@ -1239,7 +1249,7 @@
     </string-array>
     <string-array name="resizeNames">
         <item>Pequeño</item>
-        <item>Medio</item>
+        <item>Mediano</item>
         <item>Grande</item>
         <item>Extra grande</item>
     </string-array>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 6d0e93b77b..539d987faf 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -299,10 +299,6 @@
     <string name="title_advanced_addresses">Erakutsi helbidearen xehetasunak lehenetsita</string>
     <string name="title_advanced_attachments_alt">Erakutsi gehitutakoa mezuko testuaren ondoren</string>
     <string name="title_advanced_contrast">Erabili kontraste altua mezuaren testuarentzat</string>
-    <string name="title_advanced_monospaced">Erabili tipografia monoespaziatua mezuen testuan</string>
-    <string name="title_advanced_text_color">Erakutsi testu-koloreak</string>
-    <string name="title_advanced_text_size">Erakutsi testu labur eta luzeak</string>
-    <string name="title_advanced_text_align">Erakutsi ezkerrean/erdian/eskuinean lerrokatutako testuak</string>
     <string name="title_advanced_collapse_quotes">Tolestu aipatutako testua</string>
     <string name="title_advanced_images_inline">Erakutsi automatikoki txertatutako irudiak</string>
     <string name="title_advanced_seekbar">Erakutsi posizio erlatiboa elkarrizketan puntu batekin</string>
@@ -746,7 +742,6 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_style_italic">Etzana</string>
     <string name="title_style_underline">Azpimarra</string>
     <string name="title_style_size">Tamaina</string>
-    <string name="title_style_color">Kolorea</string>
     <string name="title_style_clear">Garbitu formatua</string>
     <string name="title_style_link">Txertatu esteka</string>
     <string name="title_add_image">Gehitu irudia</string>
@@ -1012,8 +1007,6 @@ Honekin aldeko eta kontrako botoen arteko oreka mantenduko da.
     <string name="title_legend_bold">Bihurtu testu lodia</string>
     <string name="title_legend_italic">Bihurtu testu etzana</string>
     <string name="title_legend_underline">Azpimarratu testua</string>
-    <string name="title_legend_text_size">Ezarri testuaren tamaina</string>
-    <string name="title_legend_text_color">Ezarri testuaren kolorea</string>
     <string name="title_legend_metered">Konexioa neurtua da</string>
     <string name="title_legend_unmetered">Konexioa ez da neurtua</string>
     <string name="title_legend_roaming">Ibiltaritza</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index d3d4dccfd7..d2e2870d93 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -280,9 +280,6 @@
     <string name="title_advanced_addresses">نمایش جزئیات آدرس به صورت پیش‌فرض</string>
     <string name="title_advanced_attachments_alt">نمایش پیوست‌ها بعد از متن پیام</string>
     <string name="title_advanced_contrast">از کنتراست زیاد برای متن پیام استفاده کن</string>
-    <string name="title_advanced_monospaced">از فونت monospaced(تک پهنه) برای متن پیام استفاده کن</string>
-    <string name="title_advanced_text_color">تنظیم رنگ‌های متن</string>
-    <string name="title_advanced_text_size">نمایش متن‌های کوچک و بزرگ</string>
     <string name="title_advanced_collapse_quotes">بستن متن نقل شده</string>
     <string name="title_advanced_actionbar">نمایش نوار کنش گفتگو</string>
     <string name="title_advanced_actionbar_color">از رنگ حساب به‌عنوان رنگ پس‌زمینه برای نوار کنش گفتگو استفاده کن</string>
@@ -627,7 +624,6 @@
     <string name="title_style_italic">مورب</string>
     <string name="title_style_underline">خط زیر</string>
     <string name="title_style_size">اندازه</string>
-    <string name="title_style_color">رنگ</string>
     <string name="title_style_clear">پاک کردن شکل‌بندی</string>
     <string name="title_style_link">درج لینک</string>
     <string name="title_add_image">افزودن تصویر</string>
@@ -874,8 +870,6 @@
     <string name="title_legend_bold">متن پررنگ شود</string>
     <string name="title_legend_italic">متن مورب شود</string>
     <string name="title_legend_underline">متن زیر خط دار</string>
-    <string name="title_legend_text_size">تنظیم اندازه متن</string>
-    <string name="title_legend_text_color">تنظیم رنگ متن</string>
     <string name="title_legend_metered">به شبکه موبایل متصلید</string>
     <string name="title_legend_unmetered">به شبکه غیر موبایل متصلید</string>
     <string name="title_legend_roaming">رومینگ</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index a2ff82057e..d6a6544127 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -302,10 +302,6 @@
     <string name="title_advanced_addresses">Näytä viestin osoitetiedot oletuksena</string>
     <string name="title_advanced_attachments_alt">Näytä liitteet viestin tekstin jälkeen</string>
     <string name="title_advanced_contrast">Käytä voimakasta kontrastia viestien tekstille</string>
-    <string name="title_advanced_monospaced">Käytä kiinteävälistä kirjaisinta viestien tekstille</string>
-    <string name="title_advanced_text_color">Näytä tekstin värit</string>
-    <string name="title_advanced_text_size">Näytä pienet ja suuret tekstit</string>
-    <string name="title_advanced_text_align">Näytä vasemmalle/keskelle/oikealle tasatut tekstit</string>
     <string name="title_advanced_collapse_quotes">Tiivistä lainattu teksti</string>
     <string name="title_advanced_images_inline">Näytä tekstiin upotetut kuvat oletuksena</string>
     <string name="title_advanced_seekbar">Näytä suhteellinen sijainti keskustelussa pisteellä</string>
@@ -754,11 +750,14 @@
     <string name="title_send_encryption">Salaus</string>
     <string name="title_send_priority">Tärkeysjärjestys</string>
     <string name="title_no_server">Palvelinta ei löytynyt osoitteesta \'%1$s\'</string>
+    <string name="title_style">Tyyli</string>
     <string name="title_style_bold">Lihavointi</string>
     <string name="title_style_italic">Kursiivi</string>
     <string name="title_style_underline">Alleviivaus</string>
     <string name="title_style_size">Koko</string>
-    <string name="title_style_color">Väri</string>
+    <string name="title_style_size_small">Pieni</string>
+    <string name="title_style_size_medium">Keskikokoinen</string>
+    <string name="title_style_size_large">Suuri</string>
     <string name="title_style_clear">Poista muotoilu</string>
     <string name="title_style_link">Lisää linkki</string>
     <string name="title_add_image">Lisää kuva</string>
@@ -1024,8 +1023,6 @@
     <string name="title_legend_bold">Lihavoi teksti</string>
     <string name="title_legend_italic">Kursivoi teksti</string>
     <string name="title_legend_underline">Alleviivaa teksti</string>
-    <string name="title_legend_text_size">Aseta tekstin koko</string>
-    <string name="title_legend_text_color">Aseta tekstin väri</string>
     <string name="title_legend_metered">Yhteys on käytön mukaan laskutettava</string>
     <string name="title_legend_unmetered">Yhteys ei ole käytön mukaan laskutettava</string>
     <string name="title_legend_roaming">Verkkovierailu</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 28a9f39e04..3172c39b02 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -306,8 +306,9 @@
     <string name="title_advanced_contrast">Utiliser un contraste élevé pour le texte du message</string>
     <string name="title_advanced_monospaced">Utiliser une police à espacement fixe pour le texte du message</string>
     <string name="title_advanced_text_color">Afficher les couleurs du texte</string>
-    <string name="title_advanced_text_size">Afficher des petits et des grands textes</string>
-    <string name="title_advanced_text_align">Afficher les textes alignés à gauche/au centre/à droite</string>
+    <string name="title_advanced_text_size">Utiliser la taille du texte</string>
+    <string name="title_advanced_text_font">Utiliser les polices de caractères</string>
+    <string name="title_advanced_text_align">Utiliser l\'alignement du texte</string>
     <string name="title_advanced_collapse_quotes">Replier le texte cité</string>
     <string name="title_advanced_images_inline">Afficher automatiquement les images incluses</string>
     <string name="title_advanced_seekbar">Afficher la position relative dans la conversation avec un point</string>
@@ -373,7 +374,7 @@
     <string name="title_advanced_hide_timezone">Envoyer les messages sans les données de fuseau horaire</string>
     <string name="title_advanced_display_hidden">Afficher les textes cachés des messages</string>
     <string name="title_advanced_secure">Masquer FairEmail de la liste des applications récentes et empêcher la prise de captures d’écran</string>
-    <string name="title_advanced_pin">Code NIP</string>
+    <string name="title_advanced_pin">NIP</string>
     <string name="title_advanced_biometrics_timeout">Délai d’expiration de l’authentification biométrique</string>
     <string name="title_advanced_sign_default">Signer par défaut</string>
     <string name="title_advanced_encrypt_default">Chiffrer par défaut</string>
@@ -756,11 +757,21 @@
     <string name="title_send_encryption">Chiffrement</string>
     <string name="title_send_priority">Priorité</string>
     <string name="title_no_server">Aucun serveur trouvé à \'%1$s\'</string>
+    <string name="title_style">Style</string>
     <string name="title_style_bold">Gras</string>
     <string name="title_style_italic">Italique</string>
     <string name="title_style_underline">Souligner</string>
     <string name="title_style_size">Taille</string>
-    <string name="title_style_color">Couleur</string>
+    <string name="title_style_size_small">Petit</string>
+    <string name="title_style_size_medium">Moyen</string>
+    <string name="title_style_size_large">Grand</string>
+    <string name="title_style_font">Police de caractères</string>
+    <string name="title_style_font_cursive">Cursive</string>
+    <string name="title_style_font_serif">Avec empattement</string>
+    <string name="title_style_font_sans_serif">Sans empattement</string>
+    <string name="title_style_font_monospace">À espacement fixe</string>
+    <string name="title_style_font_default">Par défaut</string>
+    <string name="title_style_color">Couleur&#8230;</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
     <string name="title_add_image">Ajouter une image</string>
@@ -1026,8 +1037,7 @@
     <string name="title_legend_bold">Mettre le texte en gras</string>
     <string name="title_legend_italic">Mettre le texte en italique</string>
     <string name="title_legend_underline">Souligner le texte</string>
-    <string name="title_legend_text_size">Définir la taille du texte</string>
-    <string name="title_legend_text_color">Définir la couleur du texte</string>
+    <string name="title_legend_text_style">Définir le style du texte</string>
     <string name="title_legend_metered">La connexion est limitée</string>
     <string name="title_legend_unmetered">La connexion n’est pas limitée</string>
     <string name="title_legend_roaming">Itinérance</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 049fdf4a41..7803a2025e 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -217,7 +217,7 @@
     <string name="title_advanced_section_misc">Divers</string>
     <string name="title_advanced_receive">Recevoir des messages pour tous les comptes</string>
     <string name="title_advanced_when">Quand</string>
-    <string name="title_advanced_always">Toujours recevoir des messages pour ces comptes</string>
+    <string name="title_advanced_always">Recevoir les messages en continu pour ces comptes</string>
     <string name="title_advanced_schedule">Planification</string>
     <string name="title_advanced_advanced">Avancé</string>
     <string name="title_advanced_no_date">Messages sans date</string>
@@ -306,8 +306,9 @@
     <string name="title_advanced_contrast">Utiliser un contraste élevé pour le texte du message</string>
     <string name="title_advanced_monospaced">Utiliser une police à espacement fixe pour le texte du message</string>
     <string name="title_advanced_text_color">Afficher les couleurs du texte</string>
-    <string name="title_advanced_text_size">Afficher des petits et des grands textes</string>
-    <string name="title_advanced_text_align">Afficher les textes alignés à gauche/au centre/à droite</string>
+    <string name="title_advanced_text_size">Utiliser la taille du texte</string>
+    <string name="title_advanced_text_font">Utiliser les polices de caractères</string>
+    <string name="title_advanced_text_align">Utiliser l\'alignement du texte</string>
     <string name="title_advanced_collapse_quotes">Replier le texte cité</string>
     <string name="title_advanced_images_inline">Afficher automatiquement les images incluses</string>
     <string name="title_advanced_seekbar">Indiquer la position relative de la conversation avec un point</string>
@@ -756,11 +757,21 @@
     <string name="title_send_encryption">Chiffrement</string>
     <string name="title_send_priority">Priorité</string>
     <string name="title_no_server">Aucun serveur trouvé à \'%1$s\'</string>
+    <string name="title_style">Style</string>
     <string name="title_style_bold">Gras</string>
     <string name="title_style_italic">Italique</string>
     <string name="title_style_underline">Souligner</string>
     <string name="title_style_size">Taille</string>
-    <string name="title_style_color">Couleur</string>
+    <string name="title_style_size_small">Petit</string>
+    <string name="title_style_size_medium">Moyen</string>
+    <string name="title_style_size_large">Grand</string>
+    <string name="title_style_font">Police de caractères</string>
+    <string name="title_style_font_cursive">Cursive</string>
+    <string name="title_style_font_serif">Avec empattement</string>
+    <string name="title_style_font_sans_serif">Sans empattement</string>
+    <string name="title_style_font_monospace">À espacement fixe</string>
+    <string name="title_style_font_default">Par défaut</string>
+    <string name="title_style_color">Couleur&#8230;</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
     <string name="title_add_image">Ajouter une image</string>
@@ -1026,8 +1037,7 @@
     <string name="title_legend_bold">Mettre le texte en gras</string>
     <string name="title_legend_italic">Mettre le texte en italique</string>
     <string name="title_legend_underline">Souligner le texte</string>
-    <string name="title_legend_text_size">Définir la taille du texte</string>
-    <string name="title_legend_text_color">Définir la couleur du texte</string>
+    <string name="title_legend_text_style">Définir le style du texte</string>
     <string name="title_legend_metered">La connexion est limitée</string>
     <string name="title_legend_unmetered">La connexion n’est pas limitée</string>
     <string name="title_legend_roaming">Itinérance</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 86246095b2..cb028ed6e6 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -202,7 +202,6 @@
     <string name="title_advanced_font_size_subject">Underwerp foar lettertypegrutte</string>
     <string name="title_advanced_flags">Sjoch stjerren</string>
     <string name="title_advanced_preview">Sjoch berjochtfoarbyld</string>
-    <string name="title_advanced_text_color">Sjoch tekstkleuren</string>
     <string name="title_advanced_images_inline">Inline ôfbyldings automatysk sjen litte</string>
     <string name="title_advanced_authentication">Lit in warskôging sjen doe\'t de ûntfangende server it berjocht net koe autentisearje</string>
     <string name="title_advanced_notifications">Notifikaasjes beheare</string>
@@ -341,7 +340,6 @@
     <string name="title_style_italic">Kursyf</string>
     <string name="title_style_underline">Ûnderstreekje</string>
     <string name="title_style_size">Grutte</string>
-    <string name="title_style_color">Kleur</string>
     <string name="title_style_link">Link ynfoegje</string>
     <string name="title_attachment_file">Heakje bestân ta</string>
     <string name="title_attachment_photo">Nim foto</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 23b5831d2d..0944d567f6 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -277,9 +277,6 @@
     <string name="title_advanced_addresses">Prema zadanim postavkama prikazuje pojedinosti adrese</string>
     <string name="title_advanced_attachments_alt">Prikažite privitke nakon teksta poruke</string>
     <string name="title_advanced_contrast">Koristi visoki kontrast za tekst poruke</string>
-    <string name="title_advanced_monospaced">Upotrijebiti font u jednolikim razmjerima za tekst poruke</string>
-    <string name="title_advanced_text_color">Pokaži boje teksta</string>
-    <string name="title_advanced_text_size">Prikaži male i velike tekstove</string>
     <string name="title_advanced_collapse_quotes">Sažmi citirani tekst</string>
     <string name="title_advanced_images_inline">Automatski prikaz uključenih slika</string>
     <string name="title_advanced_seekbar">Prikaži relativni položaj razgovora s točkom</string>
@@ -665,7 +662,6 @@
     <string name="title_style_italic">Kurziv</string>
     <string name="title_style_underline">Naglasi</string>
     <string name="title_style_size">Veličina</string>
-    <string name="title_style_color">Boja</string>
     <string name="title_style_clear">Očisti sva oblikovanja</string>
     <string name="title_style_link">Umetni vezu</string>
     <string name="title_add_attachment">Dodaj prilog</string>
@@ -879,8 +875,6 @@
     <string name="title_legend_bold">Postavi tekst podebljano</string>
     <string name="title_legend_italic">Postavi tekst kurzivno</string>
     <string name="title_legend_underline">Podcrtaj tekst</string>
-    <string name="title_legend_text_size">Postavi veličinu teksta</string>
-    <string name="title_legend_text_color">Postavi boju teksta</string>
     <string name="title_legend_metered">Veza se mjeri</string>
     <string name="title_legend_unmetered">Veza se ne mjeri</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index a61ff4b117..633731a648 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -300,10 +300,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_advanced_addresses">Cím részleteinek alapértelmezett megjelenítése</string>
     <string name="title_advanced_attachments_alt">Csatolmányok megjelenítése a szöveg után</string>
     <string name="title_advanced_contrast">Magas kontraszt használata az üzenetek szövegéhez</string>
-    <string name="title_advanced_monospaced">Monospace betűtípus használata az üzenetek szövegéhez</string>
-    <string name="title_advanced_text_color">Szöveg színek megjelenítése</string>
-    <string name="title_advanced_text_size">Kicsi és nagy szövegek megjelenítése</string>
-    <string name="title_advanced_text_align">Balra/középre/jobbra igazított szöveg megjelenítése</string>
     <string name="title_advanced_collapse_quotes">Idézett szöveg összecsukása</string>
     <string name="title_advanced_images_inline">Beágyazott képek automatikus megjelenitese</string>
     <string name="title_advanced_seekbar">Relatív beszélgetés-pozíció ponttal váló megjelenítése</string>
@@ -742,7 +738,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_style_italic">Dőlt</string>
     <string name="title_style_underline">Aláhúzott</string>
     <string name="title_style_size">Méret</string>
-    <string name="title_style_color">Szín</string>
     <string name="title_style_clear">Formázás törlése</string>
     <string name="title_style_link">Hivatkozás beillesztése</string>
     <string name="title_add_image">Kép hozzáadása</string>
@@ -1002,8 +997,6 @@ A szabályokkal kapcsolatos funkciók csak pro verzióban érhetők el.
     <string name="title_legend_bold">Szöveg félkövérré változtatása</string>
     <string name="title_legend_italic">Szöveg dőltté változtatása</string>
     <string name="title_legend_underline">Szöveg aláhúzása</string>
-    <string name="title_legend_text_size">Szövegméret beállítása</string>
-    <string name="title_legend_text_color">Szövegszín beállítása</string>
     <string name="title_legend_metered">A kapcsolat mért</string>
     <string name="title_legend_unmetered">A kapcsolat nem mért</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 508f9a0beb..d16de5f571 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -304,10 +304,11 @@
     <string name="title_advanced_addresses">Mostra i dettagli dell\'indirizzo per impostazione predefinita</string>
     <string name="title_advanced_attachments_alt">Mostra allegati dopo il testo del messaggio</string>
     <string name="title_advanced_contrast">Usa il contrasto elevato per il testo del messaggio</string>
-    <string name="title_advanced_monospaced">Usa il carattere monospazio per il testo del messaggio</string>
-    <string name="title_advanced_text_color">Mostra colori testo</string>
-    <string name="title_advanced_text_size">Mostra testi piccoli e grandi</string>
-    <string name="title_advanced_text_align">Mostra testi allineati sinistra/centro/destra</string>
+    <string name="title_advanced_monospaced">Usa caratteri monospaziati per il testo del messaggio standard</string>
+    <string name="title_advanced_text_color">Usa colori testo</string>
+    <string name="title_advanced_text_size">Usa dimensioni testo</string>
+    <string name="title_advanced_text_font">Usa i tipi di caratteri</string>
+    <string name="title_advanced_text_align">Usa l\'allineamento testo</string>
     <string name="title_advanced_collapse_quotes">Comprimi testo citato</string>
     <string name="title_advanced_images_inline">Mostra automaticamente le immagini in linea</string>
     <string name="title_advanced_seekbar">Mostra la posizione relativa della conversazione con un punto</string>
@@ -755,11 +756,21 @@
     <string name="title_send_encryption">Crittografia</string>
     <string name="title_send_priority">Priorità</string>
     <string name="title_no_server">Nessun server trovato in \'%1$s\'</string>
+    <string name="title_style">Stile</string>
     <string name="title_style_bold">Grassetto</string>
     <string name="title_style_italic">Corsivo</string>
     <string name="title_style_underline">Sottolinea</string>
     <string name="title_style_size">Dimensioni</string>
-    <string name="title_style_color">Colore</string>
+    <string name="title_style_size_small">Piccolo</string>
+    <string name="title_style_size_medium">Medio</string>
+    <string name="title_style_size_large">Grande</string>
+    <string name="title_style_font">Tipo di carattere</string>
+    <string name="title_style_font_cursive">Corsivo</string>
+    <string name="title_style_font_serif">Caratteri con grazie</string>
+    <string name="title_style_font_sans_serif">Caratteri senza grazie</string>
+    <string name="title_style_font_monospace">Monospaziato</string>
+    <string name="title_style_font_default">Predefinito</string>
+    <string name="title_style_color">Colore &#8230;</string>
     <string name="title_style_clear">Cancella formattazione</string>
     <string name="title_style_link">Inserisci collegamento</string>
     <string name="title_add_image">Aggiungi immagine</string>
@@ -1025,8 +1036,7 @@
     <string name="title_legend_bold">Rendi il testo grassetto</string>
     <string name="title_legend_italic">Rendi il testo corsivo</string>
     <string name="title_legend_underline">Sottolineatura</string>
-    <string name="title_legend_text_size">Imposta dimensione testo</string>
-    <string name="title_legend_text_color">Imposta colore testo</string>
+    <string name="title_legend_text_style">Imposta stile del testo</string>
     <string name="title_legend_metered">La connessione è a consumo</string>
     <string name="title_legend_unmetered">La connessione non è a consumo</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index c805072828..ea933ae07b 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -257,7 +257,7 @@
     <string name="title_ask_save">לשמור את השינויים?</string>
     <string name="title_submitter">נשלח מאת:</string>
     <string name="title_delivered_to">נמסר ל:</string>
-    <string name="title_from">מ:</string>
+    <string name="title_from">1546</string>
     <string name="title_to">אל:</string>
     <string name="title_sent">נשלח:</string>
     <string name="title_received">התקבל: </string>
@@ -277,7 +277,6 @@
     <string name="title_style_italic">נטוי</string>
     <string name="title_style_underline">קו תחתון</string>
     <string name="title_style_size">גודל</string>
-    <string name="title_style_color">צבע</string>
     <string name="title_style_link">הכנס קישור</string>
     <string name="title_add_image">הוסף תמונה</string>
     <string name="title_add_image_inline">הזן</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index bbd0d90e5e..705a1f5a0e 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -278,10 +278,6 @@ Microsoft Exchange WebサービスやMicrosoft ActiveSyncなどの非標準プ
     <string name="title_advanced_addresses">デフォルトでアドレスの詳細を表示</string>
     <string name="title_advanced_attachments_alt">メッセージテキストの後に添付ファイルを表示</string>
     <string name="title_advanced_contrast">メッセージテキストにハイコントラストを使用</string>
-    <string name="title_advanced_monospaced">メッセージテキストに等幅フォントを使用</string>
-    <string name="title_advanced_text_color">テキストの色を表示</string>
-    <string name="title_advanced_text_size">大小のテキストを表示</string>
-    <string name="title_advanced_text_align">左/中央/右揃えのテキストを表示</string>
     <string name="title_advanced_collapse_quotes">引用テキストを折りたたむ</string>
     <string name="title_advanced_images_inline">インライン画像を自動的に表示</string>
     <string name="title_advanced_seekbar">ドットで相対的な会話の位置を表示</string>
@@ -716,7 +712,6 @@ PlayストアでFairEmailを評価できれば幸いです。
     <string name="title_style_italic">斜体</string>
     <string name="title_style_underline">下線</string>
     <string name="title_style_size">サイズ</string>
-    <string name="title_style_color">カラー</string>
     <string name="title_style_clear">書式をクリア</string>
     <string name="title_style_link">リンクを挿入</string>
     <string name="title_add_image">画像を追加</string>
@@ -975,8 +970,6 @@ PlayストアでFairEmailを評価できれば幸いです。
     <string name="title_legend_bold">テキストを太字にする</string>
     <string name="title_legend_italic">テキストを斜体にする</string>
     <string name="title_legend_underline">テキストに下線を引く</string>
-    <string name="title_legend_text_size">文字サイズを設定する</string>
-    <string name="title_legend_text_color">テキストの色を設定する</string>
     <string name="title_legend_metered">接続が計測されます</string>
     <string name="title_legend_unmetered">接続は未測定です</string>
     <string name="title_legend_roaming">ローミング</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 0988fe8dd1..f25ca4c566 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -303,10 +303,11 @@
     <string name="title_advanced_addresses">Adresgegevens standaard weergeven</string>
     <string name="title_advanced_attachments_alt">Bijlagen weergeven na de berichttekst</string>
     <string name="title_advanced_contrast">Gebruik hoge contrast voor berichttekst</string>
-    <string name="title_advanced_monospaced">Gebruik vaste breedte lettertype voor berichttekst</string>
-    <string name="title_advanced_text_color">Tekstkleuren weergeven</string>
-    <string name="title_advanced_text_size">Kleine en grote teksten weergeven</string>
-    <string name="title_advanced_text_align">Links/midden/rechts uitgelijnde teksten weergeven</string>
+    <string name="title_advanced_monospaced">Gebruik standaard vaste breedte lettertype voor berichttekst</string>
+    <string name="title_advanced_text_color">Gebruik tekstkleuren</string>
+    <string name="title_advanced_text_size">Gebruik tekstgrootte</string>
+    <string name="title_advanced_text_font">Gebruik lettertypen</string>
+    <string name="title_advanced_text_align">Gebruik tekstuitlijning</string>
     <string name="title_advanced_collapse_quotes">Geciteerde tekst samenvouwen</string>
     <string name="title_advanced_images_inline">Automatisch inline afbeeldingen weergeven</string>
     <string name="title_advanced_seekbar">Toon relatieve gesprekspositie met een punt</string>
@@ -755,11 +756,21 @@
     <string name="title_send_encryption">Versleuteling</string>
     <string name="title_send_priority">Prioriteit</string>
     <string name="title_no_server">Geen server gevonden op \'%1$s\'</string>
+    <string name="title_style">Stijl</string>
     <string name="title_style_bold">Vet</string>
     <string name="title_style_italic">Cursief</string>
     <string name="title_style_underline">Onderlijn</string>
     <string name="title_style_size">Grootte</string>
-    <string name="title_style_color">Kleur</string>
+    <string name="title_style_size_small">Klein</string>
+    <string name="title_style_size_medium">Middelgroot</string>
+    <string name="title_style_size_large">Groot</string>
+    <string name="title_style_font">Lettertype</string>
+    <string name="title_style_font_cursive">Schrijfletter</string>
+    <string name="title_style_font_serif">Met schreef</string>
+    <string name="title_style_font_sans_serif">Schreefloos</string>
+    <string name="title_style_font_monospace">Vaste breedte</string>
+    <string name="title_style_font_default">Standaard</string>
+    <string name="title_style_color">Kleur &#8230;</string>
     <string name="title_style_clear">Opmaak wissen</string>
     <string name="title_style_link">Koppeling invoegen</string>
     <string name="title_add_image">Afbeelding toevoegen</string>
@@ -1025,8 +1036,7 @@
     <string name="title_legend_bold">Tekst vet maken</string>
     <string name="title_legend_italic">Tekst cursief maken</string>
     <string name="title_legend_underline">Tekst onderstrepen</string>
-    <string name="title_legend_text_size">Tekstgrootte instellen</string>
-    <string name="title_legend_text_color">Tekstkleur instellen</string>
+    <string name="title_legend_text_style">Stel tekststijl in</string>
     <string name="title_legend_metered">Verbinding is gemeten</string>
     <string name="title_legend_unmetered">Verbinding is ongemeten</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 2885ece7d5..df04bd968f 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -280,9 +280,6 @@
     <string name="title_advanced_addresses">Vis adresseinformasjon som standard</string>
     <string name="title_advanced_attachments_alt">Vis vedlegg etter meldingsteksten</string>
     <string name="title_advanced_contrast">Bruk høy kontrast for meldingstekst</string>
-    <string name="title_advanced_monospaced">Bruk monospaced skrift for meldingstekst</string>
-    <string name="title_advanced_text_color">Vis tekstfarger</string>
-    <string name="title_advanced_text_size">Vis små og store tekster</string>
     <string name="title_advanced_collapse_quotes">Kollapse sitert tekst</string>
     <string name="title_advanced_images_inline">Vis automatisk innebygde bilder</string>
     <string name="title_advanced_seekbar">Vis relativ samtaleposisjon med en prikk</string>
@@ -682,7 +679,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_style_italic">Kursiv</string>
     <string name="title_style_underline">Understrek</string>
     <string name="title_style_size">Størrelse</string>
-    <string name="title_style_color">Farge</string>
     <string name="title_style_clear">Fjern formatering</string>
     <string name="title_style_link">Sett inn lenke</string>
     <string name="title_add_attachment">Legg ved fil</string>
@@ -898,8 +894,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_legend_bold">Gjøre teksten fet</string>
     <string name="title_legend_italic">Gjøre teksten kursiv</string>
     <string name="title_legend_underline">Understreke tekst</string>
-    <string name="title_legend_text_size">Angi tekststørrelse</string>
-    <string name="title_legend_text_color">Angi tekstfarge</string>
     <string name="title_legend_metered">Tilkoblingen er målt</string>
     <string name="title_legend_unmetered">Tilkoblingen er ikke målt</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 2885ece7d5..df04bd968f 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -280,9 +280,6 @@
     <string name="title_advanced_addresses">Vis adresseinformasjon som standard</string>
     <string name="title_advanced_attachments_alt">Vis vedlegg etter meldingsteksten</string>
     <string name="title_advanced_contrast">Bruk høy kontrast for meldingstekst</string>
-    <string name="title_advanced_monospaced">Bruk monospaced skrift for meldingstekst</string>
-    <string name="title_advanced_text_color">Vis tekstfarger</string>
-    <string name="title_advanced_text_size">Vis små og store tekster</string>
     <string name="title_advanced_collapse_quotes">Kollapse sitert tekst</string>
     <string name="title_advanced_images_inline">Vis automatisk innebygde bilder</string>
     <string name="title_advanced_seekbar">Vis relativ samtaleposisjon med en prikk</string>
@@ -682,7 +679,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_style_italic">Kursiv</string>
     <string name="title_style_underline">Understrek</string>
     <string name="title_style_size">Størrelse</string>
-    <string name="title_style_color">Farge</string>
     <string name="title_style_clear">Fjern formatering</string>
     <string name="title_style_link">Sett inn lenke</string>
     <string name="title_add_attachment">Legg ved fil</string>
@@ -898,8 +894,6 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
     <string name="title_legend_bold">Gjøre teksten fet</string>
     <string name="title_legend_italic">Gjøre teksten kursiv</string>
     <string name="title_legend_underline">Understreke tekst</string>
-    <string name="title_legend_text_size">Angi tekststørrelse</string>
-    <string name="title_legend_text_color">Angi tekstfarge</string>
     <string name="title_legend_metered">Tilkoblingen er målt</string>
     <string name="title_legend_unmetered">Tilkoblingen er ikke målt</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index faf96ab8c5..8459270168 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -326,9 +326,10 @@
     <string name="title_advanced_attachments_alt">Pokaż załączniki za treścią wiadomości</string>
     <string name="title_advanced_contrast">Użyj wysokiego kontrastu dla tekstu wiadomości</string>
     <string name="title_advanced_monospaced">Użyj czcionki o stałej szerokości dla tekstu wiadomości</string>
-    <string name="title_advanced_text_color">Pokaż kolory tekstu</string>
-    <string name="title_advanced_text_size">Pokaż małe i duże teksty</string>
-    <string name="title_advanced_text_align">Pokaż wyrównywanie tekstu do lewej/środka/prawej</string>
+    <string name="title_advanced_text_color">Użyj kolorów tekstu</string>
+    <string name="title_advanced_text_size">Użyj rozmiarów tekstu</string>
+    <string name="title_advanced_text_font">Użyj czcionek</string>
+    <string name="title_advanced_text_align">Użyj wyrównania tekstu</string>
     <string name="title_advanced_collapse_quotes">Zwiń cytowany tekst</string>
     <string name="title_advanced_images_inline">Automatycznie pokazuj wstawione obrazy</string>
     <string name="title_advanced_seekbar">Pokaż względną pozycję rozmowy za pomocą kropki</string>
@@ -777,11 +778,21 @@
     <string name="title_send_encryption">Szyfrowanie</string>
     <string name="title_send_priority">Priorytet</string>
     <string name="title_no_server">Nie znaleziono serwera na \'%1$s\'</string>
+    <string name="title_style">Styl</string>
     <string name="title_style_bold">Pogrubienie</string>
     <string name="title_style_italic">Kursywa</string>
     <string name="title_style_underline">Podkreślenie</string>
     <string name="title_style_size">Rozmiar</string>
-    <string name="title_style_color">Kolor</string>
+    <string name="title_style_size_small">Mały</string>
+    <string name="title_style_size_medium">Średni</string>
+    <string name="title_style_size_large">Duży</string>
+    <string name="title_style_font">Czcionka</string>
+    <string name="title_style_font_cursive">Kursywa</string>
+    <string name="title_style_font_serif">Szeryfowa</string>
+    <string name="title_style_font_sans_serif">Bezszeryfowa</string>
+    <string name="title_style_font_monospace">O stałej szerokości znaków</string>
+    <string name="title_style_font_default">Domyślna</string>
+    <string name="title_style_color">Kolor &#8230;</string>
     <string name="title_style_clear">Wyczyść formatowanie</string>
     <string name="title_style_link">Wstaw link</string>
     <string name="title_add_image">Dodaj obraz</string>
@@ -1047,8 +1058,7 @@
     <string name="title_legend_bold">Pogrubienie</string>
     <string name="title_legend_italic">Kursywa</string>
     <string name="title_legend_underline">Podkreśl tekst</string>
-    <string name="title_legend_text_size">Ustaw rozmiar tekstu</string>
-    <string name="title_legend_text_color">Ustaw kolor tekstu</string>
+    <string name="title_legend_text_style">Ustaw styl tekstu</string>
     <string name="title_legend_metered">Połączenie jest taryfowe</string>
     <string name="title_legend_unmetered">Połączenie nie jest taryfowe</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 61aa716dda..5337dd5867 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -290,10 +290,6 @@
     <string name="title_advanced_addresses">Mostrar detalhes do endereço por padrão</string>
     <string name="title_advanced_attachments_alt">Mostrar anexos após o texto da mensagem</string>
     <string name="title_advanced_contrast">Usar alto contraste para o texto da mensagem</string>
-    <string name="title_advanced_monospaced">Usar fonte mono-espaçada para o texto da mensagem</string>
-    <string name="title_advanced_text_color">Mostrar cores do texto</string>
-    <string name="title_advanced_text_size">Mostrar textos pequenos e grandes</string>
-    <string name="title_advanced_text_align">Mostrar textos alinhados à esquerda/centro/direita</string>
     <string name="title_advanced_collapse_quotes">Recolher texto citado</string>
     <string name="title_advanced_images_inline">Mostrar imagens em linha automaticamente</string>
     <string name="title_advanced_seekbar">Mostrar posição relativa da conversa com um ponto</string>
@@ -729,7 +725,6 @@
     <string name="title_style_italic">Itálico</string>
     <string name="title_style_underline">Sublinhado</string>
     <string name="title_style_size">Tamanho</string>
-    <string name="title_style_color">Cor</string>
     <string name="title_style_clear">Limpar formatação</string>
     <string name="title_style_link">Inserir link</string>
     <string name="title_add_image">Adicionar imagem</string>
@@ -953,8 +948,6 @@
     <string name="title_legend_bold">Colocar o texto em negrito</string>
     <string name="title_legend_italic">Colocar o texto em itálico</string>
     <string name="title_legend_underline">Sublinhado</string>
-    <string name="title_legend_text_size">Definir tamanho do texto</string>
-    <string name="title_legend_text_color">Definir cor do texto</string>
     <string name="title_legend_metered">A conexão é limitada</string>
     <string name="title_legend_unmetered">A conexão é ilimitada</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 94c22ee75d..c8df1784bb 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -256,10 +256,6 @@
     <string name="title_advanced_addresses">Mostrar detalhes do endereço por pré-definição</string>
     <string name="title_advanced_attachments_alt">Mostrar anexos após o texto da mensagem</string>
     <string name="title_advanced_contrast">Usar alto contraste para o texto da mensagem</string>
-    <string name="title_advanced_monospaced">Usar fonte monoespaçada para o texto da mensagem</string>
-    <string name="title_advanced_text_color">Mostrar cores do texto</string>
-    <string name="title_advanced_text_size">Mostrar textos pequenos e grandes</string>
-    <string name="title_advanced_text_align">Mostrar textos alinhados à esquerda/centro/direita</string>
     <string name="title_advanced_collapse_quotes">Encolher texto cidado</string>
     <string name="title_advanced_images_inline">Mostrar automaticamente imagens embutidas</string>
     <string name="title_advanced_seekbar">Exibir posição relativa de conversa com um ponto</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5e29dcd879..5c9d094c48 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -314,10 +314,6 @@
     <string name="title_advanced_addresses">Implicit arată detaliile adreselor</string>
     <string name="title_advanced_attachments_alt">Arată atașamentele după textul mesajului</string>
     <string name="title_advanced_contrast">Folosește contrast ridicat pentru text</string>
-    <string name="title_advanced_monospaced">Folosește fontul proporțional pentru textul mesajului</string>
-    <string name="title_advanced_text_color">Arată culori text</string>
-    <string name="title_advanced_text_size">Arată mărimile mici și mari de text</string>
-    <string name="title_advanced_text_align">Arată textele aliniate stânga/centru/dreapta</string>
     <string name="title_advanced_collapse_quotes">Restrânge textul citat</string>
     <string name="title_advanced_images_inline">Arată automat imaginile integrate</string>
     <string name="title_advanced_seekbar">Arată poziția relativă în conversație cu un punct</string>
@@ -767,7 +763,6 @@
     <string name="title_style_italic">Cursiv</string>
     <string name="title_style_underline">Subliniere</string>
     <string name="title_style_size">Mărime</string>
-    <string name="title_style_color">Culoare</string>
     <string name="title_style_clear">Elimină toate formatările</string>
     <string name="title_style_link">Inserare legătură</string>
     <string name="title_add_image">Adăugare imagine</string>
@@ -1033,8 +1028,6 @@
     <string name="title_legend_bold">Face textul aldin</string>
     <string name="title_legend_italic">Face textul cursiv</string>
     <string name="title_legend_underline">Subliniere text</string>
-    <string name="title_legend_text_size">Setare mărime text</string>
-    <string name="title_legend_text_color">Setare culoare text</string>
     <string name="title_legend_metered">Conexiunea este contorizată</string>
     <string name="title_legend_unmetered">Conexiunea este necontorizată</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 375d92a870..54e3d18a3a 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -326,10 +326,11 @@
     <string name="title_advanced_addresses">По умолчанию показывать подробную информацию об адресах</string>
     <string name="title_advanced_attachments_alt">Показывать вложения после текста сообщения</string>
     <string name="title_advanced_contrast">Использовать высокий контраст для текста сообщений</string>
-    <string name="title_advanced_monospaced">Использовать моноширинный шрифт для текста сообщения</string>
+    <string name="title_advanced_monospaced">По умолчанию использовать моношированный шрифт для текста сообщения</string>
     <string name="title_advanced_text_color">Использовать цвета текста</string>
-    <string name="title_advanced_text_size">Использовать размеры шрифта текста</string>
-    <string name="title_advanced_text_align">Использовать выравнивание текста по центру/краям</string>
+    <string name="title_advanced_text_size">Использовать размер текста</string>
+    <string name="title_advanced_text_font">Использовать шрифты</string>
+    <string name="title_advanced_text_align">Использовать выравнивание текста</string>
     <string name="title_advanced_collapse_quotes">Сворачивать цитируемый текст</string>
     <string name="title_advanced_images_inline">Автоматически показывать встроенные изображения</string>
     <string name="title_advanced_seekbar">Показывать относительное положение диалога точкой</string>
@@ -778,11 +779,21 @@
     <string name="title_send_encryption">Шифрование</string>
     <string name="title_send_priority">Приоритет</string>
     <string name="title_no_server">Сервер не найден на \'%1$s\'</string>
+    <string name="title_style">Стиль</string>
     <string name="title_style_bold">Жирный</string>
     <string name="title_style_italic">Курсив</string>
     <string name="title_style_underline">Подчёркнутый</string>
     <string name="title_style_size">Размер</string>
-    <string name="title_style_color">Цвет</string>
+    <string name="title_style_size_small">Маленький</string>
+    <string name="title_style_size_medium">Средний</string>
+    <string name="title_style_size_large">Большой</string>
+    <string name="title_style_font">Шрифт</string>
+    <string name="title_style_font_cursive">Курсив</string>
+    <string name="title_style_font_serif">С засечками</string>
+    <string name="title_style_font_sans_serif">Без засечек</string>
+    <string name="title_style_font_monospace">Моноширинный</string>
+    <string name="title_style_font_default">По умолчанию</string>
+    <string name="title_style_color">Цвет &#8230;</string>
     <string name="title_style_clear">Очистить форматирование</string>
     <string name="title_style_link">Вставить ссылку</string>
     <string name="title_add_image">Добавить изображение</string>
@@ -1048,8 +1059,7 @@
     <string name="title_legend_bold">Выделить текст жирным шрифтом</string>
     <string name="title_legend_italic">Выделить текст курсивом</string>
     <string name="title_legend_underline">Выделить текст подчёркиванием</string>
-    <string name="title_legend_text_size">Установить размер текста</string>
-    <string name="title_legend_text_color">Установить цвет текста</string>
+    <string name="title_legend_text_style">Задать стиль текста</string>
     <string name="title_legend_metered">Подключение лимитировано</string>
     <string name="title_legend_unmetered">Подключение безлимитное</string>
     <string name="title_legend_roaming">Роуминг</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index 57e5cd3773..41bc8203c3 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -307,9 +307,6 @@
     <string name="title_advanced_addresses">Privzeto prikaži podrobnosti naslova</string>
     <string name="title_advanced_attachments_alt">Prikaži priloge pod besedilom sporočila</string>
     <string name="title_advanced_contrast">Uporabi visoki kontrast za besedilo sporočila</string>
-    <string name="title_advanced_monospaced">Uporabi stalno širino za besedilo sporočila</string>
-    <string name="title_advanced_text_color">Prikaži barve besedila</string>
-    <string name="title_advanced_text_size">Prikaži majhna in velika besedila</string>
     <string name="title_advanced_collapse_quotes">Strni navedeno besedilo</string>
     <string name="title_advanced_images_inline">Samodejno prikaži slike v besedilu</string>
     <string name="title_advanced_seekbar">Prikaži relativni položaj pogovora s piko</string>
@@ -735,7 +732,6 @@
     <string name="title_style_italic">Ležeče</string>
     <string name="title_style_underline">Podčrtaj</string>
     <string name="title_style_size">Velikost</string>
-    <string name="title_style_color">Barva</string>
     <string name="title_style_clear">Počisti oblikovanje</string>
     <string name="title_style_link">Vstavi povezavo</string>
     <string name="title_add_image">Dodaj sliko</string>
@@ -990,8 +986,6 @@
     <string name="title_legend_bold">Naredi besedilo krepko</string>
     <string name="title_legend_italic">Naredi besedilo ležeče</string>
     <string name="title_legend_underline">Podčrtaj besedilo</string>
-    <string name="title_legend_text_size">Nastavi velikost besedila</string>
-    <string name="title_legend_text_color">Nastavi barvo besedila</string>
     <string name="title_legend_metered">Povezava je merjena</string>
     <string name="title_legend_unmetered">Povezava ni merjena.</string>
     <string name="title_legend_roaming">Gostovanje</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 64a669178c..972b440e1f 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -246,8 +246,6 @@
     <string name="title_advanced_addresses">Подразумевано прикажи детаље адресе</string>
     <string name="title_advanced_attachments_alt">Прикажи прилоге после текста поруке</string>
     <string name="title_advanced_contrast">Користи јак контраст за текст поруке</string>
-    <string name="title_advanced_monospaced">Користи фонт фиксне ширине за текст поруке</string>
-    <string name="title_advanced_text_color">Прикажи боју текста</string>
     <string name="title_advanced_collapse_quotes">Сажми цитирани текст</string>
     <string name="title_advanced_images_inline">Аутоматски приказуј уметнуте слике</string>
     <string name="title_advanced_seekbar">Прикажи релативну позицију у разговору са тачком</string>
@@ -590,7 +588,6 @@
     <string name="title_style_italic">Курзив</string>
     <string name="title_style_underline">Подвучено</string>
     <string name="title_style_size">Величина</string>
-    <string name="title_style_color">Боја</string>
     <string name="title_style_clear">Очисти форматирање</string>
     <string name="title_style_link">Убаци везу</string>
     <string name="title_add_image">Додај слику</string>
@@ -820,8 +817,6 @@
     <string name="title_legend_bold">Подебљај текст</string>
     <string name="title_legend_italic">Закоси текст</string>
     <string name="title_legend_underline">Подвуци текст</string>
-    <string name="title_legend_text_size">Подеси величину текста</string>
-    <string name="title_legend_text_color">Подеси боју текста</string>
     <string name="title_legend_metered">Конекција мери потрошњу података</string>
     <string name="title_legend_unmetered">Конекција не мери потрошњу података</string>
     <string name="title_legend_roaming">Роминг</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 25640e3738..3ec4c2e211 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -303,10 +303,11 @@
     <string name="title_advanced_addresses">Visa adressuppgifter som standard</string>
     <string name="title_advanced_attachments_alt">Visa bilagor efter meddelandetexten</string>
     <string name="title_advanced_contrast">Använd hög kontrast för meddelandetext</string>
-    <string name="title_advanced_monospaced">Använd monospace-typsnitt för meddelandetexten</string>
-    <string name="title_advanced_text_color">Visa textfärger</string>
-    <string name="title_advanced_text_size">Visa små och stora texter</string>
-    <string name="title_advanced_text_align">Visa vänster/mitten/högerinriktade texter</string>
+    <string name="title_advanced_monospaced">Använd monospaced typsnitt för meddelandetext som standard</string>
+    <string name="title_advanced_text_color">Använd textfärger</string>
+    <string name="title_advanced_text_size">Använd textstorlekar</string>
+    <string name="title_advanced_text_font">Använd typsnitt</string>
+    <string name="title_advanced_text_align">Använd textjustering</string>
     <string name="title_advanced_collapse_quotes">Kollapsa citerad text</string>
     <string name="title_advanced_images_inline">Visa automatiskt infogade bilder</string>
     <string name="title_advanced_seekbar">Visa relativ konversationsposition med en punkt</string>
@@ -755,11 +756,21 @@
     <string name="title_send_encryption">Kryptering</string>
     <string name="title_send_priority">Prioritet</string>
     <string name="title_no_server">Ingen server hittades vid \"%1$s\"</string>
+    <string name="title_style">Stil</string>
     <string name="title_style_bold">Fetstil</string>
     <string name="title_style_italic">Kursiv</string>
     <string name="title_style_underline">Understryk</string>
     <string name="title_style_size">Storlek</string>
-    <string name="title_style_color">Färg</string>
+    <string name="title_style_size_small">Liten</string>
+    <string name="title_style_size_medium">Medel</string>
+    <string name="title_style_size_large">Stor</string>
+    <string name="title_style_font">Typsnitt</string>
+    <string name="title_style_font_cursive">Kursivt</string>
+    <string name="title_style_font_serif">Serif</string>
+    <string name="title_style_font_sans_serif">Sans-serif</string>
+    <string name="title_style_font_monospace">Monospace</string>
+    <string name="title_style_font_default">Standard</string>
+    <string name="title_style_color">Färg &#8230;</string>
     <string name="title_style_clear">Rensa formatering</string>
     <string name="title_style_link">Infoga länk</string>
     <string name="title_add_image">Lägg till bild</string>
@@ -1025,8 +1036,7 @@
     <string name="title_legend_bold">Gör texten fet</string>
     <string name="title_legend_italic">Gör texten kursiv</string>
     <string name="title_legend_underline">Understryk text</string>
-    <string name="title_legend_text_size">Ange textstorlek</string>
-    <string name="title_legend_text_color">Ange textfärg</string>
+    <string name="title_legend_text_style">Ange textstil</string>
     <string name="title_legend_metered">Uppmätt anslutning</string>
     <string name="title_legend_unmetered">Icke-uppmätt anslutning</string>
     <string name="title_legend_roaming">Roaming</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 84fe49de51..3a563a92c2 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -274,9 +274,6 @@
     <string name="title_advanced_addresses">Öntanımlı olarak adres ayrıntılarını göster</string>
     <string name="title_advanced_attachments_alt">İleti metninden sonra ekleri göster</string>
     <string name="title_advanced_contrast">İleti metni için yüksek karşıtlık kullan</string>
-    <string name="title_advanced_monospaced">İleti metni için tek aralıklı yazı tipi kullan</string>
-    <string name="title_advanced_text_color">Metin renklerini göster</string>
-    <string name="title_advanced_text_size">Küçük ve büyük metinleri göster</string>
     <string name="title_advanced_collapse_quotes">Alıntılanan metni daralt</string>
     <string name="title_advanced_images_inline">İletideki görselleri otomatik olarak göster</string>
     <string name="title_advanced_seekbar">Göreli konuşma konumunu nokta ile göster</string>
@@ -661,7 +658,6 @@
     <string name="title_style_italic">Eğik yazı</string>
     <string name="title_style_underline">Alt çizgi</string>
     <string name="title_style_size">Boyut</string>
-    <string name="title_style_color">Renk</string>
     <string name="title_style_clear">Biçimlendirmeyi temizle</string>
     <string name="title_style_link">Bağlantı ekle</string>
     <string name="title_add_image">Görsel ekle</string>
@@ -907,8 +903,6 @@
     <string name="title_legend_bold">Metni kalın harf yap</string>
     <string name="title_legend_italic">Metni eğik yazı yap</string>
     <string name="title_legend_underline">Tetnin altını çiz</string>
-    <string name="title_legend_text_size">Metin boyutunu ayarla</string>
-    <string name="title_legend_text_color">Metin rengini ayarla</string>
     <string name="title_legend_metered">Bağlantı ölçülü</string>
     <string name="title_legend_unmetered">Bağlantı ölçüsüz</string>
     <string name="title_legend_roaming">Gezeleme</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 009f541cca..285263976a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -292,10 +292,11 @@
     <string name="title_advanced_addresses">默认显示地址详情</string>
     <string name="title_advanced_attachments_alt">在消息文本后显示附件</string>
     <string name="title_advanced_contrast">对消息文本使用高对比度颜色</string>
-    <string name="title_advanced_monospaced">对邮件文本使用等宽字体</string>
-    <string name="title_advanced_text_color">显示文本颜色</string>
-    <string name="title_advanced_text_size">显示大小文本</string>
-    <string name="title_advanced_text_align">显示左/中/右对齐文本</string>
+    <string name="title_advanced_monospaced">默认对消息文本使用等宽字体</string>
+    <string name="title_advanced_text_color">使用文本颜色</string>
+    <string name="title_advanced_text_size">使用文本大小</string>
+    <string name="title_advanced_text_font">使用字体</string>
+    <string name="title_advanced_text_align">使用文本对齐</string>
     <string name="title_advanced_collapse_quotes">折叠引用文本</string>
     <string name="title_advanced_images_inline">自动显示内联图像</string>
     <string name="title_advanced_seekbar">在底部用一个圆点显示会话相对位置</string>
@@ -744,11 +745,21 @@
     <string name="title_send_encryption">加密</string>
     <string name="title_send_priority">优先级</string>
     <string name="title_no_server">在 \'%1$s\' 找不到服务器</string>
+    <string name="title_style">样式</string>
     <string name="title_style_bold">粗体</string>
     <string name="title_style_italic">斜体</string>
     <string name="title_style_underline">下划线</string>
     <string name="title_style_size">大小</string>
-    <string name="title_style_color">颜色</string>
+    <string name="title_style_size_small">小</string>
+    <string name="title_style_size_medium">中等</string>
+    <string name="title_style_size_large">大</string>
+    <string name="title_style_font">字体</string>
+    <string name="title_style_font_cursive">草体</string>
+    <string name="title_style_font_serif">衬线体</string>
+    <string name="title_style_font_sans_serif">无衬线体</string>
+    <string name="title_style_font_monospace">等宽字体</string>
+    <string name="title_style_font_default">默认</string>
+    <string name="title_style_color">颜色 &#8230;</string>
     <string name="title_style_clear">清除格式</string>
     <string name="title_style_link">插入链接</string>
     <string name="title_add_image">添加图片</string>
@@ -1014,8 +1025,7 @@
     <string name="title_legend_bold">加粗文本</string>
     <string name="title_legend_italic">倾斜文本</string>
     <string name="title_legend_underline">给文本加下划线</string>
-    <string name="title_legend_text_size">设置文本大小</string>
-    <string name="title_legend_text_color">设定文本颜色</string>
+    <string name="title_legend_text_style">设置文本样式</string>
     <string name="title_legend_metered">连接是计量的</string>
     <string name="title_legend_unmetered">连接是不计量的</string>
     <string name="title_legend_roaming">漫游</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 1762a1c72c..077e98e91e 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -262,10 +262,6 @@
     <string name="title_advanced_addresses">預設展開詳細郵件資訊</string>
     <string name="title_advanced_attachments_alt">附件顯示於訊息之後</string>
     <string name="title_advanced_contrast">訊息內容高對比</string>
-    <string name="title_advanced_monospaced">訊息內容使用等寬字型</string>
-    <string name="title_advanced_text_color">顯示文字顏色</string>
-    <string name="title_advanced_text_size">顯示不同大小的文字</string>
-    <string name="title_advanced_text_align">顯示左中右對齊的文字</string>
     <string name="title_advanced_collapse_quotes">折疊引用的文字</string>
     <string name="title_advanced_images_inline">自動顯示行內圖片</string>
     <string name="title_advanced_seekbar">使用點點顯示目前對話的相對位置</string>