diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index f5bc632d88..7b4781dac3 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1312,6 +1312,13 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 с</item>
+        <item>5 с</item>
+        <item>7,5 с</item>
+        <item>10 с</item>
+    </string-array>
     <string-array name="fontNameNames">
         <item>Курсив</item>
         <item>Serif</item>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 7af96f07d4..e6325150f7 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1268,4 +1268,11 @@ La creació i l\'ús de regles és una característica professional.    </string
         <item>Només signar S/MIME</item>
         <item>Signar i xifrar S/MIME</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 5f3c55907b..82f89bf52a 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1370,9 +1370,9 @@
     </string-array>
     <string-array name="undoNames">
         <item>Vyp.</item>
-        <item>2.5 s</item>
+        <item>2,5 s</item>
         <item>5 s</item>
-        <item>7.5 s</item>
+        <item>7,5 s</item>
         <item>10 s</item>
     </string-array>
     <string-array name="fontNameNames">
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 2c65700cea..9ab2a576ba 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_limitations">Eksempelvis vil beskeder altid blive omformateret for at fjerne usikre elementer samt for at øge læsbarheden, og åbning af links skal af sikkerhedsårsager bekræftes.</string>
     <string name="app_crash">FairEmail er ikke understøttet på denne enhed, da fejl i Android forårsager nedbrud</string>
     <string name="app_exit">Tryk \'Tilbage\' igen for at afslutte</string>
+    <string name="app_cake">Utilstrækkelig tilgængelig lagerplads</string>
     <string name="channel_service">Modtagelse</string>
     <string name="channel_send">Send</string>
     <string name="channel_notification">Notifikationer</string>
@@ -800,6 +801,7 @@
     <string name="title_attachment_photo">Tag foto</string>
     <string name="title_attachment_audio">Optag lyd</string>
     <string name="title_show_addresses">Vis Cc/Bcc</string>
+    <string name="title_save_drafts">Gem udkast på serveren</string>
     <string name="title_send_dialog">Vis Send-muligheder</string>
     <string name="title_image_dialog">Vis Billed-muligheder</string>
     <string name="title_media_toolbar">Medieværktøjsbjælke</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 9a4127d31b..39b7867491 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1346,7 +1346,7 @@ Zur Erinnerung daran zeigt FairEmail einen kleinen Hinweis an, dieser verschwind
         <item>Aus</item>
         <item>2,5 s</item>
         <item>5 s</item>
-        <item>7, 5 s</item>
+        <item>7,5 s</item>
         <item>10 s</item>
     </string-array>
     <string-array name="fontNameNames">
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 57f3f3700a..9d62fa9abc 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -268,8 +268,35 @@
     <string name="title_fetching_again">Λήψη του μηνύματος ξανά από το διακομιστή</string>
     <string name="title_boundary_error">Σφάλμα κατά τη λήψη μηνυμάτων από το διακομιστή</string>
     <!-- Thunderbird -->
+    <string-array name="sendDelayedNames">
+        <item>No</item>
+        <item>15 δευτερόλεπτα</item>
+        <item>30 seconds</item>
+        <item>1 minute</item>
+        <item>2 minutes</item>
+        <item>5 λεπτά</item>
+        <item>10 minutes</item>
+    </string-array>
+    <string-array name="downloadNames">
+        <item>16 KB</item>
+        <item>32 KB</item>
+        <item>64 KB</item>
+        <item>128 KB</item>
+        <item>256 kB</item>
+        <item>512 kB</item>
+        <item>1 MB</item>
+        <item>2 MB</item>
+        <item>∞</item>
+    </string-array>
     <!-- https://en.wikipedia.org/wiki/Display_resolution -->
     <!-- https://en.wikipedia.org/wiki/Comparison_of_high-definition_smartphone_displays -->
+    <string-array name="biometricsTimeoutNames">
+        <item>One minute</item>
+        <item>2 minutes</item>
+        <item>5 λεπτά</item>
+        <item>10 minutes</item>
+        <item>20 minutes</item>
+    </string-array>
     <string-array name="linesNames">
         <item>1</item>
         <item>2</item>
@@ -289,4 +316,22 @@
         <item>S/MIME sign-only</item>
         <item>S/MIME sign+encrypt</item>
     </string-array>
+    <string-array name="sizeNames">
+        <item>0 B</item>
+        <item>256 kB</item>
+        <item>512 kB</item>
+        <item>1 MB</item>
+        <item>2 MB</item>
+        <item>5 MB</item>
+        <item>10 MB</item>
+        <item>20 MB</item>
+        <item>50 MB</item>
+    </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 1e2c9decaf..5d3e7ca696 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_limitations">Por ejemplo, el formato de los mensajes siempre será alterado para quitar elementos no seguros y para mejorar la legibilidad, y abrir enlaces debe ser confirmado por seguridad.</string>
     <string name="app_crash">FairEmail no es compatible con este dispositivo porque existen errores en Android que provocan fallos</string>
     <string name="app_exit">Volver \'atrás\' para salir</string>
+    <string name="app_cake">Espacio de almacenamiento insuficiente</string>
     <string name="channel_service">Recibir</string>
     <string name="channel_send">Enviar</string>
     <string name="channel_notification">Notificaciones</string>
@@ -338,6 +339,7 @@
     <string name="title_advanced_collapse_multiple">Colapsar mensajes en una conversación con varios mensajes al ir \'atrás\'</string>
     <string name="title_advanced_autoclose">Cerrar conversaciones automáticamente</string>
     <string name="title_advanced_onclose">Al cerrar una conversación</string>
+    <string name="title_advanced_undo">Tiempo de espera para deshacer</string>
     <string name="title_advanced_quick_filter">Mostrar iconos de filtro rápido no intrusivos</string>
     <string name="title_advanced_quick_scroll">Mostrar iconos rápidos de arriba/abajo no intrusivos</string>
     <string name="title_advanced_autoread">Marcar mensaje como leído automáticamente al moverlo</string>
@@ -791,6 +793,8 @@
     <string name="title_add_image_inline">Insertar</string>
     <string name="title_add_image_attach">Adjuntar</string>
     <string name="title_add_image_resize">Redimensionar</string>
+    <string name="title_add_image_privacy">Eliminar datos de privacidad sensibles</string>
+    <string name="title_add_image_privacy_remark">Ubicación geográfica, números de serie, etc</string>
     <string name="title_add_resize_pixels">&lt; %1$d píxeles</string>
     <string name="title_add_image_select">Seleccionar archivo</string>
     <string name="title_add_attachment">Agregar adjunto</string>
@@ -798,6 +802,7 @@
     <string name="title_attachment_photo">Tomar foto</string>
     <string name="title_attachment_audio">Grabar audio</string>
     <string name="title_show_addresses">Mostrar CC/CCO</string>
+    <string name="title_save_drafts">Guardar borradores en el servidor</string>
     <string name="title_send_dialog">Mostrar opciones de envío</string>
     <string name="title_image_dialog">Mostrar opciones de imagen</string>
     <string name="title_media_toolbar">Barra de herramientas multimedia</string>
@@ -1340,6 +1345,13 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Desactivado</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
     <string-array name="fontNameNames">
         <item>Cursiva</item>
         <item>Serif</item>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 237ffe6a26..4e1aee95e3 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -5,7 +5,7 @@
     <string name="app_welcome">FairEmail on avoimen lähdekoodin sähköpostiohjelma, joka on keskittynyt yksityisyyteen ja turvallisuuteen. Tästä syystä jotkin ominaisuudet saattavat toimia eri tavalla, kuin mihin olet tottunut.</string>
     <string name="app_limitations">Esimerkiksi viestit muotoillaan aina uudelleen vaarallisten elementtien poistamiseksi ja luettavuuden parantamiseksi, ja linkkien avaaminen pitää turvallisuuden takia erikseen vahvistaa.</string>
     <string name="app_crash">FairEmailia ei tueta tässä laitteessa, koska bugit Androidissa aiheuttavat kaatumisia</string>
-    <string name="app_exit">Mene \'takaisin\' uudelleen poistuaksesi</string>
+    <string name="app_exit">Mene ”takaisin” uudelleen poistuaksesi</string>
     <string name="channel_service">Vastaanottaminen</string>
     <string name="channel_send">Lähettäminen</string>
     <string name="channel_notification">Ilmoitukset</string>
@@ -980,6 +980,7 @@
     <string name="title_rule_tts_prefix">Uusi viesti</string>
     <string name="title_rule_tts_from">Lähettäjä</string>
     <string name="title_rule_tts_subject">Aihe</string>
+    <string name="title_rule_tts_content">Teksti</string>
     <string name="title_legend_section_synchronize">Synkronointi</string>
     <string name="title_legend_section_folders">Kansiot</string>
     <string name="title_legend_section_messages">Viestit</string>
@@ -1334,6 +1335,13 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Pois päältä</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
     <string-array name="fontNameNames">
         <item>Kursivoitu</item>
         <item>Serif</item>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 54fa2608f7..7cb2ff695e 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -338,7 +338,7 @@
     <string name="title_advanced_collapse_multiple">Replier les multiples messages d’une conversation en faisant « Retour »</string>
     <string name="title_advanced_autoclose">Fermer automatiquement les conversations</string>
     <string name="title_advanced_onclose">Lors de la fermeture d’une conversation</string>
-    <string name="title_advanced_undo">Délai d\'expiration de l\'annulation</string>
+    <string name="title_advanced_undo">Délai d’expiration de l’annulation</string>
     <string name="title_advanced_quick_filter">Afficher les icônes discrètes de filtrage rapide</string>
     <string name="title_advanced_quick_scroll">Afficher les icônes discrètes de défilement rapide vers le haut/bas</string>
     <string name="title_advanced_autoread">Marquer automatiquement les messages comme lus lors de leur déplacement</string>
@@ -793,7 +793,7 @@
     <string name="title_add_image_attach">Joindre</string>
     <string name="title_add_image_resize">Redimensionner</string>
     <string name="title_add_image_privacy">Supprimer les informations confidentielles sensibles</string>
-    <string name="title_add_image_privacy_remark">Informations de géolocalisation, numéros de série, etc</string>
+    <string name="title_add_image_privacy_remark">Informations de géolocalisation, numéros de série, etc.</string>
     <string name="title_add_resize_pixels">&lt; %1$d pixels</string>
     <string name="title_add_image_select">Sélectionner un fichier</string>
     <string name="title_add_attachment">Ajouter une pièce jointe</string>
@@ -1346,10 +1346,10 @@
     </string-array>
     <string-array name="undoNames">
         <item>Désactivé</item>
-        <item>2,5 secondes</item>
-        <item>5 secondes</item>
-        <item>7,5 secondes</item>
-        <item>10 secondes</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
     </string-array>
     <string-array name="fontNameNames">
         <item>Cursive</item>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index d5fbd442fa..aa424ead87 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -793,7 +793,7 @@
     <string name="title_add_image_attach">Joindre</string>
     <string name="title_add_image_resize">Redimensionner</string>
     <string name="title_add_image_privacy">Supprimer les informations confidentielles sensibles</string>
-    <string name="title_add_image_privacy_remark">Informations de géolocalisation, numéros de série, etc</string>
+    <string name="title_add_image_privacy_remark">Informations de géolocalisation, numéros de série, etc.</string>
     <string name="title_add_resize_pixels">&lt; %1$d pixels</string>
     <string name="title_add_image_select">Sélectionner un fichier</string>
     <string name="title_add_attachment">Ajouter une pièce jointe</string>
@@ -1346,10 +1346,10 @@
     </string-array>
     <string-array name="undoNames">
         <item>Désactivé</item>
-        <item>2,5 secondes</item>
-        <item>5 secondes</item>
-        <item>7,5 secondes</item>
-        <item>10 secondes</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
     </string-array>
     <string-array name="fontNameNames">
         <item>Cursive</item>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index e37818a5e5..2f01c7f876 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1109,4 +1109,11 @@
         <item>S/MIME samo za potpis</item>
         <item>S/MIME potpis + šifriranje</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index d740e51abc..432bd2514c 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -5,7 +5,8 @@
     <string name="app_welcome">FairEmail è un\'app opensource di posta focalizzata su privacy e sicurezza. Per questo motivo alcune caratteristiche potrebbero funzionare in modo diverso da quello a cui si è abituati.</string>
     <string name="app_limitations">Ad esempio, i messaggi verranno sempre riformattati per rimuovere elementi non sicuri e per migliorare la leggibilità e l\'apertura dei collegamenti deve essere confermata per sicurezza.</string>
     <string name="app_crash">FairEmail non è supportata su questo dispositivo a causa di bug in Android che causano crash</string>
-    <string name="app_exit">Premi di nuovo \'indietro\' per uscire</string>
+    <string name="app_exit">Premi di nuovo «indietro» per uscire</string>
+    <string name="app_cake">Spazio di archiviazione insufficiente</string>
     <string name="channel_service">Ricevi</string>
     <string name="channel_send">Invia</string>
     <string name="channel_notification">Notifiche</string>
@@ -337,6 +338,7 @@
     <string name="title_advanced_collapse_multiple">Comprimi i messaggi in una conversazione con più messaggi premendo \'indietro\'</string>
     <string name="title_advanced_autoclose">Chiudi automaticamente le conversazioni</string>
     <string name="title_advanced_onclose">Alla chiusura di una conversazione</string>
+    <string name="title_advanced_undo">Scadenza dell’annullamento</string>
     <string name="title_advanced_quick_filter">Mostra icone di filtri rapidi non vistose</string>
     <string name="title_advanced_quick_scroll">Mostra icone di scorrimento rapido non vistose</string>
     <string name="title_advanced_autoread">Segna automaticamente i messaggi come letti quando si spostano</string>
@@ -547,6 +549,7 @@
     <string name="title_no_password">Password mancante</string>
     <string name="title_no_inbox">Posta in arrivo non trovata</string>
     <string name="title_no_primary_drafts">Nessun account principale o nessuna cartella bozze</string>
+    <string name="title_no_junk_folder">Non c\'è nessuna cartella spam selezionata per questo account</string>
     <string name="title_no_identities">L\'invio di email richiede almeno un\'identità e una cartella bozze</string>
     <string name="title_no_standard">Questo fornitore utilizza un protocollo di posta elettronica proprietario e quindi non è possibile utilizzare client di terze parti</string>
     <string name="title_no_idle">Questo fornitore non supporta i messaggi push. Ciò ritarderà la ricezione di nuovi messaggi e aumenterà l\'utilizzo della batteria.</string>
@@ -795,6 +798,7 @@
     <string name="title_attachment_photo">Scatta una foto</string>
     <string name="title_attachment_audio">Registra audio</string>
     <string name="title_show_addresses">Mostra CC/CCN</string>
+    <string name="title_save_drafts">Salva bozze sul server</string>
     <string name="title_send_dialog">Mostra opzioni invio</string>
     <string name="title_image_dialog">Mostra opzioni immagine</string>
     <string name="title_media_toolbar">Barra strumenti media</string>
@@ -981,6 +985,7 @@
     <string name="title_rule_tts_prefix">Nuovo messaggio</string>
     <string name="title_rule_tts_from">Da</string>
     <string name="title_rule_tts_subject">Oggetto</string>
+    <string name="title_rule_tts_content">Testo</string>
     <string name="title_legend_section_synchronize">Sincronizza</string>
     <string name="title_legend_section_folders">Cartelle</string>
     <string name="title_legend_section_messages">Messaggi</string>
@@ -1176,6 +1181,7 @@
     <string name="title_debug_info">Informazioni di debug</string>
     <string name="title_debug_info_remark">Si prega di descrivere il problema ed indicare il momento in cui è avvenuto:</string>
     <string name="title_crash_info_remark">Descrivi cosa stavi facendo quando l\'app si è interrotta:</string>
+    <string name="title_unexpected_info_remark">Descrivi cosa stavi facendo quando l\'errore è successo:</string>
     <string name="title_widget_title_count">Nuovo conteggio dei messaggi</string>
     <string name="title_widget_title_list">Elenco messaggi</string>
     <string name="title_widget_account">Account</string>
@@ -1335,6 +1341,13 @@
         <item>20 MB</item>
         <item>50 MB</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Disattivato</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
     <string-array name="fontNameNames">
         <item>Corsivo</item>
         <item>Caratteri con grazie</item>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 50ab16a864..3a8dd85824 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -1139,4 +1139,11 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
         <item>Kun S/MIME signering</item>
         <item>S/MIME signer+krypter</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 50ab16a864..3a8dd85824 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -1139,4 +1139,11 @@ Dette vil bidra til å opprettholde en balanse mellom ugunstige og gunstige anme
         <item>Kun S/MIME signering</item>
         <item>S/MIME signer+krypter</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 1bc05820c3..d9f1c906bc 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_limitations">Przykładowo, wiadomości będą zawsze przeformatowane, aby usunąć niebezpieczne elementy i zwiększyć czytelność, a otwieranie linków musi być potwierdzane dla zachowania bezpieczeństwa.</string>
     <string name="app_crash">FairEmail nie jest obsługiwany na tym urządzeniu, ponieważ błędy w Androidzie powodują awarie</string>
     <string name="app_exit">Ponownie \'wstecz\', aby wyjść</string>
+    <string name="app_cake">Za mało miejsca w pamięci</string>
     <string name="channel_service">Odbierz</string>
     <string name="channel_send">Wyślij</string>
     <string name="channel_notification">Powiadomienia</string>
@@ -358,7 +359,7 @@
     <string name="title_advanced_collapse_multiple">Zwiń wiadomości w rozmowie z wieloma wiadomościami przy \'wstecz\'</string>
     <string name="title_advanced_autoclose">Automatycznie zamykaj konwersacje</string>
     <string name="title_advanced_onclose">Przy zamykaniu wiadomości</string>
-    <string name="title_advanced_undo">Cofnij limit czasu</string>
+    <string name="title_advanced_undo">Ustaw limit czasu dla \"Cofnij\"</string>
     <string name="title_advanced_quick_filter">Pokaż nienatarczywe ikony szybkiego filtrowania</string>
     <string name="title_advanced_quick_scroll">Pokaż nienatarczywe ikony szybkiego przewijania w górę/w dół</string>
     <string name="title_advanced_autoread">Automatycznie oznacz wiadomość jako przeczytaną przy przenoszeniu</string>
@@ -1367,9 +1368,9 @@
     </string-array>
     <string-array name="undoNames">
         <item>Wył.</item>
-        <item>2.5 s</item>
+        <item>2,5 s</item>
         <item>5 s</item>
-        <item>7.5 s</item>
+        <item>7,5 s</item>
         <item>10 s</item>
     </string-array>
     <string-array name="fontNameNames">
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d21b421203..0ba90f5192 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -145,6 +145,7 @@
     <string name="title_setup_identity">Configuração de identidades</string>
     <string name="title_setup_identity_remark">Para enviar e-mail</string>
     <string name="title_setup_identity_hint">Para mudar o nome, cor, assinatura, etc</string>
+    <string name="title_setup_identity_what">O que é uma identidade?</string>
     <string name="title_setup_permissions">Conceder permissões</string>
     <string name="title_setup_permissions_remark">Para acessar informações de contato (opcional)</string>
     <string name="title_setup_doze">Desativar otimizações de bateria</string>
@@ -875,6 +876,7 @@
     <string name="title_legend_section_folders">Pastas</string>
     <string name="title_legend_section_messages">Mensagens</string>
     <string name="title_legend_section_compose">Escrever</string>
+    <string name="title_legend_section_keyboard">Teclado</string>
     <string name="title_legend_oauth">Autorização OAuth</string>
     <string name="title_legend_primary_connected">Conta conectada</string>
     <string name="title_legend_primary_disconnected">Conta desconectada</string>
@@ -1169,4 +1171,11 @@
         <item>Assinante S/MIME</item>
         <item>Assinaturas S/MIME + criptografias</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 3c4ab94c6d..214a7a6667 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1346,6 +1346,13 @@
         <item>20 Mo</item>
         <item>50 Mo</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
     <string-array name="fontNameNames">
         <item>Cursiv</item>
         <item>Serif</item>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 47e054e887..c118ccb6c3 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1370,9 +1370,9 @@
     </string-array>
     <string-array name="undoNames">
         <item>Выкл.</item>
-        <item>2.5 сек. </item>
+        <item>2,5 с</item>
         <item>5 сек. </item>
-        <item>7.5 сек. </item>
+        <item>7,5 с</item>
         <item>10 сек. </item>
     </string-array>
     <string-array name="fontNameNames">
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index a7462e015a..1d3233127c 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -1241,4 +1241,11 @@
         <item>Samo podpiši (S/MIME)</item>
         <item>Podpiši in šifriraj (S/MIME)</item>
     </string-array>
+    <string-array name="undoNames">
+        <item>Off</item>
+        <item>2,5 s</item>
+        <item>5 s</item>
+        <item>7,5 s</item>
+        <item>10 s</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 61da474fe1..8aa85ebd30 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -6,6 +6,7 @@
     <string name="app_limitations">例如，为了去除不安全元素并提高阅读性，邮件将总被重建格式；出于安全考虑，打开邮件内链接时需经用户确认</string>
     <string name="app_crash">FairEmail不支持该设备，因为 android 中的bug会导致崩溃</string>
     <string name="app_exit">再按一次返回键退出</string>
+    <string name="app_cake">剩余存储空间不足</string>
     <string name="channel_service">接收</string>
     <string name="channel_send">发送</string>
     <string name="channel_notification">通知</string>