diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index 5015503338..8a4e5495d3 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -594,7 +594,7 @@
     <string name="title_advanced_message_text_zoom2">İlkin mesajın mətn yaxınlaşdırması: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Mesajın mətnini redaktorda da yaxınlaşdır</string>
     <string name="title_advanced_overview_mode">Orijinal mesajı tam ekrana qədər yaxınlaşdır</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Sətir boşluğu: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Sətir boşluğu: %1$s %%</string>
     <string name="title_advanced_hyphenation">Avto-defis istifadə et</string>
     <string name="title_advanced_contrast">Mesaj mətni üçün yüksək ziddiyyət istifadə et</string>
     <string name="title_advanced_monospaced">Mesaj mətni üçün ilkin olaraq tək boşluqlu şrift istifadə et</string>
@@ -2354,6 +2354,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Bağlı</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 s</item>
         <item>5 s</item>
         <item>7.5 s</item>
diff --git a/app/src/main/res/values-be-rBY/strings.xml b/app/src/main/res/values-be-rBY/strings.xml
index 635e689344..36890d245b 100644
--- a/app/src/main/res/values-be-rBY/strings.xml
+++ b/app/src/main/res/values-be-rBY/strings.xml
@@ -623,7 +623,7 @@
     <string name="title_advanced_message_text_zoom2">Стандартны маштаб тэксту паведамлення: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Павялічваць тэкст паведамлення таксама ў рэдактары паведамленняў</string>
     <string name="title_advanced_overview_mode">Павялічваць маштаб арыгінальных паведамленняў пад памер экрана</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Міжрадковы інтэрвал: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Міжрадковы інтэрвал: %1$s %%</string>
     <string name="title_advanced_hyphenation">Выкарыстоўваць аўтаматычны перанос</string>
     <string name="title_advanced_contrast">Ужываць высокі кантраст да тэксту паведамлення</string>
     <string name="title_advanced_monospaced">Выкарыстоўваць шрыфт аднолькавай шырыні для тэксту паведамлення па змаўчанні</string>
@@ -2387,6 +2387,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Выкл.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 с</item>
         <item>5 с</item>
         <item>7,5 с</item>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index f391a6b54e..52866e941e 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -2341,11 +2341,12 @@
     </string-array>
     <string-array name="undoNames">
         <item>Изкл.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 с</item>
         <item>5 с</item>
         <item>7,5 с</item>
         <item>10 с</item>
-        <item>15 с</item>
+        <item>15 s</item>
         <item>30 сек.</item>
         <item>60 сек.</item>
     </string-array>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 60316255d8..4fd1e3069e 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -608,7 +608,7 @@
     <string name="title_advanced_message_text_zoom2">Zadani nivo zumiranja teksta: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Zumiraj tekst poruke i u uređivaču poruka</string>
     <string name="title_advanced_overview_mode">Zumiraj originalne poruke da popune ekran</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Linijski razmak: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Linijski razmak: %1$s %%</string>
     <string name="title_advanced_hyphenation">Koristi automatsko umetanje crtica</string>
     <string name="title_advanced_contrast">Koristi visoki kontrast za tekst poruke</string>
     <string name="title_advanced_monospaced">Koristi po zadanom font jednake širine (monospace) za tekst poruke</string>
@@ -2369,6 +2369,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Isključeno</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 952b6fe18d..770860695b 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1512,6 +1512,7 @@ Ambdues opcions es poden desactivar si es desitja.</string>
     </string-array>
     <string-array name="undoNames">
         <item>Desactivat</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 7badfacebc..0f39f1dde6 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -622,7 +622,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_advanced_message_text_zoom2">Výchozí zvětšení textu zprávy: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Změnit přiblížení textu zprávy také v editoru zpráv</string>
     <string name="title_advanced_overview_mode">Přizpůsobit zobrazení původních zpráv šířce obrazovky</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Řádkování: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Řádkování: %1$s %%</string>
     <string name="title_advanced_hyphenation">Použít automatický rozdělovník</string>
     <string name="title_advanced_contrast">Použít vysoký kontrast pro text zprávy</string>
     <string name="title_advanced_monospaced">Automaticky použít neproporcionální písmo pro text zprávy</string>
@@ -2388,6 +2388,7 @@ v prohlížeči ze všech Google účtů.</string>
     </string-array>
     <string-array name="undoNames">
         <item>Vyp.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 62766fa256..f31cdadafb 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -594,7 +594,7 @@
     <string name="title_advanced_message_text_zoom2">Standard beskedtekstzoom %1$s%%</string>
     <string name="title_advanced_editor_text_zoom">Zoom også beskedtekst i besked-editoren</string>
     <string name="title_advanced_overview_mode">Zoom originale beskeder for skærmtilpasning</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Linjeafstand: %1$s%%</string>
+    <string name="title_advanced_line_spacing">Linjeafstand: %1$s%%</string>
     <string name="title_advanced_hyphenation">Brug automatisk orddeling</string>
     <string name="title_advanced_contrast">Benyt høj kontrast til beskedtekst</string>
     <string name="title_advanced_monospaced">Benyt som standard monospatieret skrifttype til beskedtekst</string>
@@ -944,7 +944,7 @@
     <string name="title_advanced_notify_remove_hint">Nye beskednotifikationer fjernes altid, når de stryges væk samt ved markering af beskeder som læste</string>
     <string name="title_advanced_notify_manage_hint">Tryk på kanalnavnet for at opsætte kanalegenskaberne</string>
     <string name="title_advanced_notify_samsung_hint">For at håndtere meddelelseskanaler kan man være nødt til at aktivere denne Android-indstilling: Notifikation, Avancerede indstillinger, Håndtér meddelelseskategorier for hver app</string>
-    <string name="title_advanced_notify_manage_default_hint">For at indstille standardlyden skal du konfigurere DND (forstyr ikke) osv.</string>
+    <string name="title_advanced_notify_manage_default_hint">For at indstille standardlyden, opsæt DND (forstyr ikke) mv.</string>
     <string name="title_advanced_notify_manage_service_hint">For at deaktivere \'overvågningsnotifikationen\'</string>
     <string name="title_advanced_notify_separate_hint">Hvordan opsættes notifikationer for konti, mapper og afsendere?</string>
     <string name="title_advanced_notify_preview_all_hint">For wearables, som kan vise den fulde tekst (op til 5.000 tegn)</string>
@@ -2362,6 +2362,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Fra</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 20c9ccf69e..1d990df756 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -595,7 +595,7 @@
     <string name="title_advanced_message_text_zoom2">Standardgröße des Nachrichtentextes: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Größe des Nachrichtentextes auch im Verfassenfenster anpassen</string>
     <string name="title_advanced_overview_mode">Originalnachrichten an Bildschirmgröße anpassen</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Zeilenabstand: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Zeilenabstand: %1$s %%</string>
     <string name="title_advanced_hyphenation">Automatische Worttrennung verwenden</string>
     <string name="title_advanced_contrast">Hohen Kontrast für den Nachrichtentext verwenden</string>
     <string name="title_advanced_monospaced">Festbreitenschriftarten standardmäßig für den Nachrichtentext verwenden</string>
@@ -2363,13 +2363,14 @@
     </string-array>
     <string-array name="undoNames">
         <item>Aus</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
         <item>10 s</item>
         <item>15 s</item>
         <item>30 s</item>
-        <item>60 s</item>
+        <item>60 Sek.</item>
     </string-array>
     <string-array name="fontNameNames">
         <item>Kursiv</item>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index ee54f8eb75..9784f1391e 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -593,7 +593,7 @@
     <string name="title_advanced_message_text_zoom2">Μεγέθυνση κειμένου μηνύματος από προεπιλογή: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Μεγέθυνση του κειμένου του μηνύματος και κατά την επεξεργασία του μηνύματος</string>
     <string name="title_advanced_overview_mode">Μεγέθυνση αρχικού μηνύματος για προσαρμογή στην οθόνη</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Απόσταση μεταξύ γραμμών: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Απόσταση μεταξύ γραμμών: %1$s %%</string>
     <string name="title_advanced_hyphenation">Χρήση αυτόματου συλλαβισμού</string>
     <string name="title_advanced_contrast">Χρήση υψηλής αντίθεσης για το κείμενο του μηνύματος</string>
     <string name="title_advanced_monospaced">Χρήση γραμματοσειράς σταθερού πλάτους από προεπιλογή</string>
@@ -2356,6 +2356,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Απενεργοποιημένο</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 853e9657a9..908b8826cd 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -593,7 +593,7 @@
     <string name="title_advanced_message_text_zoom2">Zoom por defecto del texto del mensaje: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Agrandar el texto del mensaje también en el editor de mensajes</string>
     <string name="title_advanced_overview_mode">Hacer zoom en mensajes originales para ajustarse a la pantalla</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Espaciado de líneas: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Espaciado de líneas: %1$s %%</string>
     <string name="title_advanced_hyphenation">Usar separación automática</string>
     <string name="title_advanced_contrast">Utilizar contraste alto para el texto del mensaje</string>
     <string name="title_advanced_monospaced">Usar fuente monoespaciada para el texto del mensaje por defecto</string>
@@ -2356,6 +2356,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Desactivado</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
index 2ba307c395..9a81404a5b 100644
--- a/app/src/main/res/values-et-rEE/strings.xml
+++ b/app/src/main/res/values-et-rEE/strings.xml
@@ -593,7 +593,7 @@
     <string name="title_advanced_message_text_zoom2">Sõnumieksti vaikesuum: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Suumi sõnumi teksti ka sõnumitoimetajas</string>
     <string name="title_advanced_overview_mode">Sõnumite ekraanile mahutamiseks suumi algseid sõnumeid</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Rea kõrgus: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Rea kõrgus: %1$s %%</string>
     <string name="title_advanced_hyphenation">Kasuta automaatpoolitamist</string>
     <string name="title_advanced_contrast">Kasuta sõnumi teksti puhul kõrgkontrasti</string>
     <string name="title_advanced_monospaced">Kasuta vaikimisi sõnumi teksti puhul püsisammkirja</string>
@@ -2353,6 +2353,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Väljas</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index c88bf5454f..8bec8ae785 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1659,6 +1659,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Itzalita</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index b5b2fddd86..deec88cace 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -520,7 +520,7 @@
     <string name="title_advanced_message_text_zoom2">بزرگ‌نمایی پیش‌فرض متن پیام: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">متن پیام را نیز در ویرایشگر پیام بزرگنمایی کنید</string>
     <string name="title_advanced_overview_mode">بزرگنمایی پیام‌های اصلی متناسب با اندازه صفحه</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">فاصله خطوط: %1$s %%</string>
+    <string name="title_advanced_line_spacing">فاصله خطوط: %1$s %%</string>
     <string name="title_advanced_hyphenation">از خط تیره گذاری خودکار استفاده کن</string>
     <string name="title_advanced_contrast">از کنتراست زیاد برای متن پیام استفاده کن</string>
     <string name="title_advanced_monospaced">استفاده از فونت تک‌فاصله (monospaced) برای متن پیام به طور پیش‌فرض</string>
@@ -1704,6 +1704,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>خاموش</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 s</item>
         <item>5 s</item>
         <item>7.5 s</item>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index dce7f8a3e7..4da9d1f48b 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -2321,6 +2321,7 @@ Tämä voi epäonnistua, minkä takia vanha viesti siirretään roskakoriin talt
     </string-array>
     <string-array name="undoNames">
         <item>Pois päältä</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 3aa6da0c77..2597555f80 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -594,7 +594,7 @@
     <string name="title_advanced_message_text_zoom2">Zoom du texte du message par défaut : %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Zoomer le texte du message également dans l\'éditeur de message</string>
     <string name="title_advanced_overview_mode">Zoomer sur les messages originaux pour les adapter à l\'écran</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Interligne : %1$s %%</string>
+    <string name="title_advanced_line_spacing">Interligne : %1$s %%</string>
     <string name="title_advanced_hyphenation">Utiliser la césure automatique</string>
     <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>
@@ -2362,6 +2362,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Désactivé</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 8d674ad21e..be194dd506 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -594,7 +594,7 @@
     <string name="title_advanced_message_text_zoom2">Zoom du texte du message par défaut : %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Zoomer le texte du message également dans l\'éditeur de message</string>
     <string name="title_advanced_overview_mode">Zoomer sur les messages originaux pour les adapter à l\'écran</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Interligne : %1$s %%</string>
+    <string name="title_advanced_line_spacing">Interligne : %1$s %%</string>
     <string name="title_advanced_hyphenation">Utiliser la césure automatique</string>
     <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>
@@ -2362,6 +2362,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Désactivé</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index e68cc5ab30..0fd613d087 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -589,7 +589,7 @@ It blokkearjen fan in ôfstjoerderdomein makket gebrûk fan filterregels, wat in
     <string name="title_advanced_message_text_zoom2">Standert zoom berjochttekst: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Berjochttekst ek yn de berjochtbewurker zoome</string>
     <string name="title_advanced_overview_mode">Zoom orizjinele berjochten om op it skerm te passen</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Regelôfstân: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Regelôfstân: %1$s %%</string>
     <string name="title_advanced_hyphenation">Automatyske keppeltekens brûke</string>
     <string name="title_advanced_contrast">Heech kontrast foar berjochttekst brûke</string>
     <string name="title_advanced_monospaced">Standert monospaced lettertype foar berjochttekst brûke</string>
@@ -2349,6 +2349,7 @@ https://en.wikipedia.org/wiki/ASCII</string>
     </string-array>
     <string-array name="undoNames">
         <item>Ut</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 65c09ae65e..7cd2a28903 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1905,6 +1905,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Apagado</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 s</item>
         <item>5 s</item>
         <item>7.5 s</item>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 2471678b2a..6107eb21a4 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1881,6 +1881,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Isključeno</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 0d611e6464..ec28d33a67 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -590,7 +590,7 @@
     <string name="title_advanced_message_text_zoom2">Szöveg nagyítás alapértelmezett érték: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Az üzenetszerkesztőben is állítható a szöveg nagyítása</string>
     <string name="title_advanced_overview_mode">Eredeti üzenetek kinagyítására teljes képernyőre</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Sorköz: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Sorköz: %1$s %%</string>
     <string name="title_advanced_hyphenation">Automatikus elválasztás használata</string>
     <string name="title_advanced_contrast">Magas kontraszt használata az üzenetek szövegéhez</string>
     <string name="title_advanced_monospaced">Fix szélességű betűtípus használata az üzenetek szövegéhez</string>
@@ -2351,6 +2351,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Ki</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 mp</item>
         <item>2,5 mp</item>
         <item>5 mp</item>
         <item>7,5 mp</item>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index dafff99abf..fa31c0bba1 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -2334,11 +2334,12 @@ Kunci dan sertifikat umumnya dapat ditemukan di menu Lanjutan - Enkripsi dan kre
     </string-array>
     <string-array name="undoNames">
         <item>Tidak aktif</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 detik</item>
         <item>5 detik</item>
         <item>7.5 detik</item>
         <item>10 detik</item>
-        <item>15 detik</item>
+        <item>15 s</item>
         <item>30 dtk</item>
         <item>60 dtk</item>
     </string-array>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index ab9388ef58..157a9321a2 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -594,7 +594,7 @@
     <string name="title_advanced_message_text_zoom2">Ingrandimento predefinito del testo del messaggio %1$s%%</string>
     <string name="title_advanced_editor_text_zoom">Ingrandisci il testo del messaggio anche nell\'editor dei messaggi</string>
     <string name="title_advanced_overview_mode">Ingrandisci i messaggi originali per adattarsi allo schermo</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Spaziatura interlinea: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Spaziatura interlinea: %1$s %%</string>
     <string name="title_advanced_hyphenation">Usa la sillabazione automatica</string>
     <string name="title_advanced_contrast">Usa il contrasto elevato per il testo del messaggio</string>
     <string name="title_advanced_monospaced">Usa sempre caratteri monospaziati per il testo del messaggio</string>
@@ -2362,13 +2362,14 @@
     </string-array>
     <string-array name="undoNames">
         <item>Off</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
         <item>10 s</item>
         <item>15 s</item>
-        <item>30 sec.</item>
-        <item>60 sec.</item>
+        <item>30 s</item>
+        <item>60 s</item>
     </string-array>
     <string-array name="fontNameNames">
         <item>Cursive</item>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index c9f685965f..9b385859b8 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -622,7 +622,7 @@
     <string name="title_advanced_message_text_zoom2">תקריב טקסט ההודעות כברירת מחדל: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">התמקדות על טקסט ההודעה גם בעורך ההודעות</string>
     <string name="title_advanced_overview_mode">התאמת התקריב של ההודעות המקוריות לגודל המסך</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">ריווח שורות: %1$s %%</string>
+    <string name="title_advanced_line_spacing">ריווח שורות: %1$s %%</string>
     <string name="title_advanced_hyphenation">להשתמש במיקוף אוטומטי</string>
     <string name="title_advanced_contrast">להשתמש בניגודיות גבוהה לטקסט ההודעות</string>
     <string name="title_advanced_monospaced">להשתמש בגופן ברוחב אחיד לטקסט ההודעה כברירת מחדל</string>
@@ -2384,11 +2384,12 @@
     </string-array>
     <string-array name="undoNames">
         <item>כבוי</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 שנ׳</item>
         <item>5 שנ׳</item>
         <item>7.5 שנ׳</item>
         <item>10 שנ׳</item>
-        <item>15 שנ׳</item>
+        <item>15 s</item>
         <item>30 שניות</item>
         <item>60 שניות</item>
     </string-array>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 3211e8313e..447e6466cf 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -580,6 +580,7 @@
     <string name="title_advanced_message_text_zoom2">デフォルトの本文のテキスト拡大率: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">メッセージ編集画面でも、テキストを拡大する</string>
     <string name="title_advanced_overview_mode">画面に合わせて元のメッセージを拡大する</string>
+    <string name="title_advanced_line_spacing">行間: %1$s %%</string>
     <string name="title_advanced_hyphenation">自動ハイフンを使用する</string>
     <string name="title_advanced_contrast">本文にハイコントラストテーマを使用する</string>
     <string name="title_advanced_monospaced">デフォルトで本文に等幅フォントを使用する</string>
@@ -595,7 +596,7 @@
     <string name="title_advanced_image_placeholders">画像のプレースホルダーを表示する</string>
     <string name="title_advanced_images_inline">インライン画像を自動で表示する</string>
     <string name="title_advanced_button_extra">メッセージの下部に追加ボタンを表示する</string>
-    <string name="title_advanced_spacing">メッセージ間のスペース</string>
+    <string name="title_advanced_spacing">メッセージと会話の間のスペース</string>
     <string name="title_advanced_seekbar">ドットで相対的な会話スレッドの位置を表示する</string>
     <string name="title_advanced_actionbar">会話スレッド アクションバーを表示する</string>
     <string name="title_advanced_actionbar_swap">ごみ箱とアーカイブのボタンを入れ替える</string>
@@ -2345,11 +2346,12 @@
     </string-array>
     <string-array name="undoNames">
         <item>オフ</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 秒</item>
         <item>5 秒</item>
         <item>7.5 秒</item>
         <item>10 秒</item>
-        <item>15 秒</item>
+        <item>15 s</item>
         <item>30 秒</item>
         <item>60 秒</item>
     </string-array>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 945817ddc1..29d06e7bed 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -579,7 +579,7 @@
     <string name="title_advanced_message_text_zoom2">기본 메시지 글자 배율: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">메시지 글자 배율을 메시지 편집기에도 적용</string>
     <string name="title_advanced_overview_mode">화면에 맞춰 원본 메시지를 조정하기</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">줄 간격: %1$s %%</string>
+    <string name="title_advanced_line_spacing">줄 간격: %1$s %%</string>
     <string name="title_advanced_hyphenation">하이픈 자동 삽입</string>
     <string name="title_advanced_contrast">메시지 텍스트에 고대비 적용</string>
     <string name="title_advanced_monospaced">기본적으로 메시지 텍스트에 고정폭 글꼴 사용</string>
@@ -2155,13 +2155,14 @@
     </string-array>
     <string-array name="undoNames">
         <item>끄기</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25초</item>
         <item>2.5초</item>
         <item>5초</item>
         <item>7.5초</item>
         <item>10초</item>
         <item>15초</item>
-        <item>30 s</item>
-        <item>60 s</item>
+        <item>30초</item>
+        <item>60초</item>
     </string-array>
     <string-array name="fontNameNames">
         <item>필기체</item>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index 52a559d9d0..6c511aed24 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -705,6 +705,7 @@
     <string name="title_rule_notes_missing">Trūkst vietējo piezīmju</string>
     <string name="title_rule_check">@string/title_check</string>
     <string name="title_rule_tts_data">Uzstādīt balss datus</string>
+    <string name="title_rule_tts_from">No</string>
     <string name="title_rule_tts_subject">@string/title_sort_on_subject</string>
     <string name="title_legend_section_folders">Mapes</string>
     <string name="title_legend_section_compose">Sastādīt</string>
@@ -724,6 +725,7 @@
     <string name="title_legend_contacts">Pārvaldīt kontaktpersonas</string>
     <string name="title_legend_hide">Slēpt saturu</string>
     <string name="title_legend_link">@string/title_style_link</string>
+    <string name="title_legend_create_rule">Izveidot kārtulu</string>
     <string name="title_legend_delete">@string/title_delete</string>
     <string name="title_legend_folder_type">Mapes tips</string>
     <string name="title_legend_enter">Atvērt</string>
@@ -767,7 +769,7 @@
     <string name="title_pro_valid">Visas Pro funkcijas aktivizētas</string>
     <string name="title_log">Žurnāls</string>
     <string name="title_rules_export">Izgūt kārtulas</string>
-    <string name="title_rules_import" comment="title_rules_import Title of menu item to import rules">Ievietot kārtulas</string>
+    <string name="title_rules_import">Ievietot kārtulas</string>
     <string name="title_rules_delete_all">Dzēst visas kārtulas</string>
     <string name="title_rules_delete_all_confirm">Vai tiešām vēlaties dzēst visas kārtulas?</string>
     <string name="title_debug_info">Atkļūdošanas informācija</string>
@@ -844,6 +846,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Off</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 s</item>
         <item>5 s</item>
         <item>7.5 s</item>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index a93bc47af3..cffbb8da94 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -1505,6 +1505,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Av</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 6412046fcf..b00d6e2f7c 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -501,13 +501,13 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_two_col">Gebruik twee kolommen</string>
     <string name="title_advanced_min_screen_size">Minimale schermgrootte voor het splitsen van het scherm</string>
     <string name="title_advanced_close_pane">Rij of kolom samenvouwen bij het sluiten van een gesprek</string>
-    <string name="title_advanced_column_width">Berichtkolom breedte / rij hoogte: %1$s %%</string>
+    <string name="title_advanced_column_width">Berichtkolom breedte / rijhoogte: %1$s %%</string>
     <string name="title_advanced_hide_toolbar">Bovenste werkbalk verbergen bij het scrollen van berichten</string>
     <string name="title_advanced_edge_to_edge">Gebruik achtergrondkleur van de app voor Android navigatiebalk</string>
-    <string name="title_advanced_nav_options">Toon navigatiemenu opties</string>
-    <string name="title_advanced_nav_categories">Toon account categorieën in het navigatiemenu</string>
+    <string name="title_advanced_nav_options">Toon navigatiemenu-opties</string>
+    <string name="title_advanced_nav_categories">Toon accountcategorieën in het navigatiemenu</string>
     <string name="title_advanced_nav_pin">Navigatiemenu vastzetten</string>
-    <string name="title_advanced_nav_hide_title">Verberg navigatiemenu opties?</string>
+    <string name="title_advanced_nav_hide_title">Verberg navigatiemenu-opties?</string>
     <string name="title_advanced_nav_hide_message">U kunt de opties opnieuw inschakelen in de weergave-instellingen</string>
     <string name="title_advanced_nav_last_sync">Toon de laatste synchronisatietijd in het navigatiemenu</string>
     <string name="title_advanced_nav_message_count">Toon aantal lokaal opgeslagen berichten in het navigatiemenu</string>
@@ -589,7 +589,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_message_text_zoom2">Standaard berichttekst zoom: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Zoom berichttekst ook in de berichteditor</string>
     <string name="title_advanced_overview_mode">Zoom oorspronkelijke berichten zodat ze op het scherm passen</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Regelafstand: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Regelafstand: %1$s %%</string>
     <string name="title_advanced_hyphenation">Gebruik automatische koppeltekens</string>
     <string name="title_advanced_contrast">Gebruik hoge contrast voor berichttekst</string>
     <string name="title_advanced_monospaced">Gebruik standaard vaste breedte lettertype voor berichttekst</string>
@@ -598,7 +598,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <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 tekst uitlijning</string>
+    <string name="title_advanced_text_align">Gebruik tekstuitlijning</string>
     <string name="title_advanced_text_titles">Toon {HTML titles}</string>
     <string name="title_advanced_text_separators">Gebruik scheidingslijnen</string>
     <string name="title_advanced_collapse_quotes">Geciteerde tekst samenvouwen</string>
@@ -610,14 +610,14 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_actionbar">Toon gespreksactiebalk</string>
     <string name="title_advanced_actionbar_swap">Prullenbak en archiefknop verwisselen</string>
     <string name="title_advanced_actionbar_color">Gebruik de accountkleur als achtergrond voor de gespreksactiebalk</string>
-    <string name="title_advanced_category_header">Groeperen op account categorie</string>
+    <string name="title_advanced_category_header">Groeperen op accountcategorie</string>
     <string name="title_advanced_list_count">Toon het aantal berichten of gesprekken in de bovenste actiebalk</string>
     <string name="title_advanced_bundled_fonts">Gebruik gebundelde lettertypen</string>
     <string name="title_advanced_narrow_fonts">Gebruik smalle lettertypen</string>
     <string name="title_advanced_parse_classes">Stijlbladen parsen</string>
     <string name="title_advanced_authentication">Toon authenticatiewaarschuwingen</string>
     <string name="title_advanced_authentication_hint">De onderliggende controles kunnen worden geconfigureerd in de ontvangstinstellingen</string>
-    <string name="title_advanced_authentication_indicator">Toon authenticatie statusindicator</string>
+    <string name="title_advanced_authentication_indicator">Toon authenticatie-statusindicator</string>
     <string name="title_advanced_authentication_none">Geen authenticatie</string>
     <string name="title_advanced_authentication_some">Gedeeltelijke authenticatie</string>
     <string name="title_advanced_authentication_all">Volledige authenticatie</string>
@@ -718,7 +718,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_rate_limit">Beperk meldingsgeluiden van nieuwe berichten tot ééns per:</string>
     <string name="title_advanced_confirm_links">Bevestig het openen van koppelingen</string>
     <string name="title_advanced_confirm_files">Bevestig het bekijken van bestanden</string>
-    <string name="title_advanced_sanitize_links">Verwijder standaard tracking parameters</string>
+    <string name="title_advanced_sanitize_links">Verwijder standaard trackingparameters</string>
     <string name="title_advanced_sanitize_links_hint">Alleen bij het bevestigen van links</string>
     <string name="title_advanced_adguard">Gebruik AdGuard filterlijst</string>
     <string name="title_advanced_adguard_weekly">Automatisch wekelijks downloaden</string>
@@ -727,8 +727,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_ask_images">Bevestig het tonen van afbeeldingen</string>
     <string name="title_advanced_confirm_html">Toon standaard opnieuw opgemaakte berichten</string>
     <string name="title_advanced_ask_html">Bevestig het tonen van originele berichten</string>
-    <string name="title_advanced_tracking">Probeer om tracking afbeeldingen te herkennen en uit te schakelen</string>
-    <string name="title_advanced_hide_timezone">Berichten verzenden zonder tijdzone data</string>
+    <string name="title_advanced_tracking">Probeer om tracking-afbeeldingen te herkennen en uit te schakelen</string>
+    <string name="title_advanced_hide_timezone">Berichten verzenden zonder tijdzone-data</string>
     <string name="title_advanced_client_id">App-naam en -versie verzenden naar mailserver</string>
     <string name="title_advanced_display_hidden">Verborgen berichtteksten weergeven</string>
     <string name="title_advanced_incognito_keyboard">Gebruik incognito toetsenbord (Android 8+)</string>
@@ -740,8 +740,8 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_advanced_generic_user_agent">Gebruik algemene browser user agent</string>
     <string name="title_advanced_load_emoji">Laad bijgewerkte Emoji van Google Play Services</string>
     <string name="title_advanced_disconnect_auto_update">Werk lijsten wekelijks automatisch bij</string>
-    <string name="title_advanced_disconnect_links">Gebruik lijsten om te waarschuwen voor tracking links</string>
-    <string name="title_advanced_disconnect_images">Gebruik lijsten om tracking afbeeldingen te herkennen</string>
+    <string name="title_advanced_disconnect_links">Gebruik lijsten om te waarschuwen voor tracking-links</string>
+    <string name="title_advanced_disconnect_images">Gebruik lijsten om tracking-afbeeldingen te herkennen</string>
     <string name="title_advanced_clear_all_hint">Hiermee worden alle app-gegevens van uw apparaat verwijderd, inclusief geconfigureerde e-mailaccounts, berichten, instellingen en alle verzamelde gegevens.</string>
     <string name="title_advanced_mnemonic">Gegevens op afstand verwijderen</string>
     <string name="title_advanced_mnemonic_hint">Elke e-mail ontvangen met de onderstaande woorden in de onderwerpregel zal automatisch en onmiddellijk de app gegevens verwijderen</string>
@@ -1403,7 +1403,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_ask_show_html_always">Toon originele berichten standaard</string>
     <string name="title_ask_show_image">Afbeeldingen tonen kan privacy gevoelige informatie lekken</string>
     <string name="title_ask_show_images_always">Afbeeldingen standaard tonen</string>
-    <string name="title_ask_show_image_hint">Afbeeldingen die als tracking afbeeldingen zijn herkend, worden niet getoond</string>
+    <string name="title_ask_show_image_hint">Afbeeldingen die als tracking-afbeeldingen zijn herkend, worden niet getoond</string>
     <string name="title_ask_show_amp">AMP variant van het bericht weergeven?</string>
     <string name="title_ask_show_amp_hint">AMP berichten zijn ontworpen om dynamisch te zijn en om te communiceren met het internet en kunnen daarom per definitie worden gebruikt om u te volgen</string>
     <string name="title_ask_view_file">Bekijk bestand %1$s ?</string>
@@ -1923,7 +1923,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_legend_reformatted">Toon opnieuw opgemaakte bericht</string>
     <string name="title_legend_external_image">Plaatshouder externe afbeelding</string>
     <string name="title_legend_embedded_image">Plaatshouder ingesloten afbeelding</string>
-    <string name="title_legend_tracking_pixel">Tracking afbeelding</string>
+    <string name="title_legend_tracking_pixel">Tracking-afbeelding</string>
     <string name="title_legend_broken_image">Defecte afbeelding</string>
     <string name="title_legend_open_external">Open buiten de app</string>
     <string name="title_legend_pick">Kies contact</string>
@@ -2008,7 +2008,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     <string name="title_suspicious_link">Dit is een verdachte koppeling</string>
     <string name="title_link_http">Verkeer wordt niet versleuteld</string>
     <string name="title_link_https">Verkeer wordt versleuteld</string>
-    <string name="title_sanitize_link">Verwijder tracking parameters</string>
+    <string name="title_sanitize_link">Verwijder trackingparameters</string>
     <string name="title_insecure_link">Deze koppeling is onveilig</string>
     <string name="title_check_owner">Controleer eigenaar</string>
     <string name="title_remark_owner">Informatie wordt opgehaald van <a href="https://ipinfo.io/">ipinfo.io</a></string>
@@ -2344,6 +2344,7 @@ Het blokkeren van een afzenderdomein maakt gebruik van filterregels, wat een pro
     </string-array>
     <string-array name="undoNames">
         <item>Uit</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index b60a89acfe..469f63ce80 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -1497,6 +1497,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Av</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 44ad9c459d..fed05cd10d 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -1497,6 +1497,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Av</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-or-rIN/strings.xml b/app/src/main/res/values-or-rIN/strings.xml
index ccf4d65d1e..652f5288bf 100644
--- a/app/src/main/res/values-or-rIN/strings.xml
+++ b/app/src/main/res/values-or-rIN/strings.xml
@@ -932,6 +932,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>ବନ୍ଦ</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>୨.୫ ସେକେଣ୍ଡ</item>
         <item>୫ ସେକେଣ୍ଡ</item>
         <item>୭.୫ ସେକେଣ୍ଡ</item>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index ecb8784d2a..245eb5d32d 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -620,7 +620,7 @@
     <string name="title_advanced_message_text_zoom2">Domyślne powiększenie tekstu wiadomości: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Powiększ tekst wiadomości również w edytorze wiadomości</string>
     <string name="title_advanced_overview_mode">Powiększ oryginalne wiadomości, aby dopasować je do ekranu</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Odstęp linii: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Odstęp linii: %1$s %%</string>
     <string name="title_advanced_hyphenation">Użyj automatycznego dzielenia wyrazów</string>
     <string name="title_advanced_contrast">Użyj wysokiego kontrastu dla tekstu wiadomości</string>
     <string name="title_advanced_monospaced">Domyślnie użyj czcionki o stałej szerokości dla tekstu wiadomości</string>
@@ -2151,7 +2151,7 @@
     <string name="title_log_clear">Wyczyść</string>
     <string name="title_rules_search_hint">Szukaj nazwy lub warunku</string>
     <string name="title_rules_export">Eksportuj reguły</string>
-    <string name="title_rules_import" comment="title_rules_import Title of menu item to import rules">Importuj reguły</string>
+    <string name="title_rules_import">Importuj reguły</string>
     <string name="title_rules_delete_all">Usuń wszystkie reguły</string>
     <string name="title_rules_delete_all_confirm">Usunąć wszystkie reguły?</string>
     <string name="title_debug_info">Info debugowania</string>
@@ -2386,6 +2386,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Wył.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 90d074b790..d829ca5c4f 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -592,7 +592,7 @@
     <string name="title_advanced_message_text_zoom2">Zoom padrão da mensagem: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Amplie o texto da mensagem também no editor de mensagens</string>
     <string name="title_advanced_overview_mode">Ampliar as mensagens originais para adequar à tela</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Espaçamento da linha: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Espaçamento da linha: %1$s %%</string>
     <string name="title_advanced_hyphenation">Usar hifenização automática</string>
     <string name="title_advanced_contrast">Usar alto contraste para o texto da mensagem</string>
     <string name="title_advanced_monospaced">Usar a fonte mono-espaçada para o texto da mensagem por padrão</string>
@@ -2356,6 +2356,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Desl.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 2f114ab444..3918de914b 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -593,7 +593,7 @@
     <string name="title_advanced_message_text_zoom2">Zoom padrão do texto da mensagem %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Ampliar o texto da mensagem também no editor de mensagens</string>
     <string name="title_advanced_overview_mode">Ampliar as mensagens originais para caber na tela</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Espaço entre linhas: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Espaço entre linhas: %1$s %%</string>
     <string name="title_advanced_hyphenation">Usar Hifenização Automática</string>
     <string name="title_advanced_contrast">Usar alto contraste para o texto da mensagem</string>
     <string name="title_advanced_monospaced">Usar a fonte monospaced para o texto da mensagem por padrão</string>
@@ -2353,6 +2353,7 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     </string-array>
     <string-array name="undoNames">
         <item>Desligado</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 410a346203..740817ea1b 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -607,7 +607,7 @@
     <string name="title_advanced_message_text_zoom2">Zoom implicit al textului mesajului: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Măriți și textul mesajului în editorul de mesaje</string>
     <string name="title_advanced_overview_mode">Măriți mesajele originale pentru a se potrivi cu ecranul</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Spațiere: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Spațiere: %1$s %%</string>
     <string name="title_advanced_hyphenation">Folosește despărțirea în silabe automată</string>
     <string name="title_advanced_contrast">Folosește contrast ridicat pentru text</string>
     <string name="title_advanced_monospaced">Folosește implicit fontul proporțional pentru textul mesajului</string>
@@ -2372,6 +2372,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Oprit</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index a279dfe3a4..808717c7bd 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -621,7 +621,7 @@
     <string name="title_advanced_message_text_zoom2">Масштаб текста сообщения по умолчанию: %1$s%%</string>
     <string name="title_advanced_editor_text_zoom">Масштабировать текст сообщения в редакторе</string>
     <string name="title_advanced_overview_mode">Изменять масштаб исходных сообщений к размеру экрана</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Межстрочный интервал: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Межстрочный интервал: %1$s %%</string>
     <string name="title_advanced_hyphenation">Автоматическая расстановка переносов</string>
     <string name="title_advanced_contrast">Использовать высокий контраст для текста сообщений</string>
     <string name="title_advanced_monospaced">Использовать моноширинный шрифт для текста сообщения по умолчанию</string>
@@ -2391,6 +2391,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Выкл.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 сек.</item>
         <item>2,5 сек.</item>
         <item>5 сек.</item>
         <item>7,5 сек.</item>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 2a8c56c0fc..0c3239c8e3 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -2308,6 +2308,7 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     </string-array>
     <string-array name="undoNames">
         <item>Vypnuté</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index d2b32c08b1..377be6b789 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -2043,6 +2043,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Izklopi</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 559bdaa76c..d1b2897e4c 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -2322,6 +2322,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Av</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-szl-rPL/strings.xml b/app/src/main/res/values-szl-rPL/strings.xml
index ecb8784d2a..245eb5d32d 100644
--- a/app/src/main/res/values-szl-rPL/strings.xml
+++ b/app/src/main/res/values-szl-rPL/strings.xml
@@ -620,7 +620,7 @@
     <string name="title_advanced_message_text_zoom2">Domyślne powiększenie tekstu wiadomości: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Powiększ tekst wiadomości również w edytorze wiadomości</string>
     <string name="title_advanced_overview_mode">Powiększ oryginalne wiadomości, aby dopasować je do ekranu</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Odstęp linii: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Odstęp linii: %1$s %%</string>
     <string name="title_advanced_hyphenation">Użyj automatycznego dzielenia wyrazów</string>
     <string name="title_advanced_contrast">Użyj wysokiego kontrastu dla tekstu wiadomości</string>
     <string name="title_advanced_monospaced">Domyślnie użyj czcionki o stałej szerokości dla tekstu wiadomości</string>
@@ -2151,7 +2151,7 @@
     <string name="title_log_clear">Wyczyść</string>
     <string name="title_rules_search_hint">Szukaj nazwy lub warunku</string>
     <string name="title_rules_export">Eksportuj reguły</string>
-    <string name="title_rules_import" comment="title_rules_import Title of menu item to import rules">Importuj reguły</string>
+    <string name="title_rules_import">Importuj reguły</string>
     <string name="title_rules_delete_all">Usuń wszystkie reguły</string>
     <string name="title_rules_delete_all_confirm">Usunąć wszystkie reguły?</string>
     <string name="title_debug_info">Info debugowania</string>
@@ -2386,6 +2386,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Wył.</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 s</item>
         <item>2,5 s</item>
         <item>5 s</item>
         <item>7,5 s</item>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index fd35930bf3..b190a10cf2 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -589,7 +589,7 @@ Gönderen etki alanını engellemek, profesyonel bir özellik olan filtre kurall
     <string name="title_advanced_message_text_zoom2">Varsayılan mesaj metni yakınlaştırma: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Mesaj metnini mesaj düzenleyicide de yakınlaştırın</string>
     <string name="title_advanced_overview_mode">Orijinal mesajları ekrana sığacak şekilde yakınlaştırın</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Satır aralığı: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Satır aralığı: %1$s %%</string>
     <string name="title_advanced_hyphenation">Otomatik hecelemeyi kullan</string>
     <string name="title_advanced_contrast">İleti metni için yüksek karşıtlık kullan</string>
     <string name="title_advanced_monospaced">İleti metninde varsayılan olarak sabit genişlikli yazı tipi kullan</string>
@@ -2348,6 +2348,7 @@ Dosya: strings. xml</string>
     </string-array>
     <string-array name="undoNames">
         <item>Kapalı</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 s</item>
         <item>5 s</item>
         <item>7.5 s</item>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index fa012d01c9..5538807efb 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -622,7 +622,7 @@
     <string name="title_advanced_message_text_zoom2">Масштаб тексту повідомлень за замовчуванням: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">Масштабувати текст повідомлення також і в редакторі повідомлень</string>
     <string name="title_advanced_overview_mode">Масштабувати оригінальні повідомлення відповідно до розміру екрана</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">Міжрядковий інтервал: %1$s %%</string>
+    <string name="title_advanced_line_spacing">Міжрядковий інтервал: %1$s %%</string>
     <string name="title_advanced_hyphenation">Використовувати автоматичне розставляння переносів</string>
     <string name="title_advanced_contrast">Використовувати висококонтрастний текст для повідомлень</string>
     <string name="title_advanced_monospaced">Використовувати моноширинний шрифт для тексту повідомлень за замовчуванням</string>
@@ -2389,6 +2389,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>Вимкнено</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1,25 с</item>
         <item>2,5 с</item>
         <item>5 с</item>
         <item>7,5 с</item>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index 02f0f9416e..e0b8cd5935 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1890,11 +1890,12 @@
     </string-array>
     <string-array name="undoNames">
         <item>Tắt</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2,5 giây</item>
         <item>5 giây</item>
         <item>7.5 giây</item>
         <item>10 giây</item>
-        <item>15 giây</item>
+        <item>15 s</item>
         <item>30 s</item>
         <item>60 s</item>
     </string-array>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index bb4f7f4f57..aea11f867d 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -579,7 +579,7 @@
     <string name="title_advanced_message_text_zoom2">默认邮件文本缩放：%1$s %%</string>
     <string name="title_advanced_editor_text_zoom">同时也在邮件编辑窗中缩放内容文本</string>
     <string name="title_advanced_overview_mode">缩放原始邮件以适应屏幕</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">行间距: %1$s %%</string>
+    <string name="title_advanced_line_spacing">行间距: %1$s %%</string>
     <string name="title_advanced_hyphenation">使用自动连字符</string>
     <string name="title_advanced_contrast">对邮件文本使用高对比度颜色</string>
     <string name="title_advanced_monospaced">默认对邮件文本使用等宽字体</string>
@@ -2340,6 +2340,7 @@
     </string-array>
     <string-array name="undoNames">
         <item>关闭</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 秒</item>
         <item>2.5 秒</item>
         <item>5 秒</item>
         <item>7.5 秒</item>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 8f9426f659..84da042ae3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -579,7 +579,7 @@
     <string name="title_advanced_message_text_zoom2">預設訊息本文文字縮放: %1$s %%</string>
     <string name="title_advanced_editor_text_zoom">在訊息編輯器中也放大訊息文字</string>
     <string name="title_advanced_overview_mode">縮放原始訊息以適配螢幕</string>
-    <string name="title_advanced_line_spacing" comment="title_advanced_line_spacing Title with value (a percentage) for line spacing of the message text">行距：%1$s %%</string>
+    <string name="title_advanced_line_spacing">行距：%1$s %%</string>
     <string name="title_advanced_hyphenation">使用自動連字符號</string>
     <string name="title_advanced_contrast">應用高對比於訊息本文上</string>
     <string name="title_advanced_monospaced">訊息本文預設使用等寬字型</string>
@@ -2326,11 +2326,12 @@ FairEmail 會顯示一則小訊息提醒你這點，購買專業功能後該訊
     </string-array>
     <string-array name="undoNames">
         <item>關閉</item>
+        <item comment="undoNames Number of seconds to show the undo popup">1.25 s</item>
         <item>2.5 秒</item>
         <item>5 秒</item>
         <item>7.5 秒</item>
         <item>10 秒</item>
-        <item>15 秒</item>
+        <item>15 s</item>
         <item>30 秒</item>
         <item>60 秒</item>
     </string-array>