diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 697744e33d..63d4c1f680 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -104,10 +104,9 @@
     <string name="title_setup_quick_remark">Per configurar ràpidament un compte i una identitat per a la majoria de proveïdors</string>
     <string name="title_setup_quick_hint">La configuració ràpida aconseguirà informació de configuració a autoconfig.thunderbird.net</string>
     <string name="title_setup_quick_imap">Servidor IMAP per rebre missatges</string>
-    <string name="title_setup_quick_smtp">Servidor SMTP per rebre missatges</string>
-    <string name="title_setup_go">Anar</string>
+    <string name="title_setup_quick_smtp">Servidor SMTP per enviar missatges</string>
+    <string name="title_setup_go">Vés-hi</string>
     <string name="title_setup_wizard">Assistent</string>
-    <string name="title_authorizing">S\'està autoritzant &#8230;</string>
     <string name="title_setup_instructions">Instruccions per la configuració</string>
     <string name="title_setup_no_settings">No s\'ha trobat cap configuració pel domini \'%1$s\'</string>
     <string name="title_setup_quick_success">S\'han afegit correctament un compte i una identitat</string>
@@ -122,7 +121,7 @@
     <string name="title_setup_identity_hint">Per canviar el nom, color, signatura, etc</string>
     <string name="title_setup_permissions">Concedeix permisos</string>
     <string name="title_setup_permissions_remark">Per accedir informació de contacte (opcional)</string>
-    <string name="title_setup_doze">Configuració de l\'optimització de batería</string>
+    <string name="title_setup_doze">Configuració de l\'optimització de bateria</string>
     <string name="title_setup_doze_remark">Per rebre correu electrònic contínuament (opcional)</string>
     <string name="title_setup_doze_instructions">En el següent diàleg, selecciona \"totes les apps\" a dalt, selecciona aquesta aplicació i polsa i confirma «no optimitzis la bateria»</string>
     <string name="title_setup_doze_battery">Ús de bateria elevat?</string>
@@ -132,7 +131,7 @@
     <string name="title_setup_done">Fet</string>
     <string name="title_setup_export">Exporta la configuració</string>
     <string name="title_setup_import">Importa una configuració</string>
-    <string name="title_setup_import_do">Els comptes importats s’afegiran sense sobreescriure els existents</string>
+    <string name="title_setup_import_do">Els comptes importats s’afegiran sense sobreescriure els ja existents</string>
     <string name="title_setup_password">Contrasenya</string>
     <string name="title_setup_password_repeat">Repeteix la contrasenya</string>
     <string name="title_setup_password_missing">Falta la contrasenya</string>
@@ -348,7 +347,6 @@
     <string name="title_no_idle">Aquest proveïdor no admet missatges push. Això retardarà la recepció de nous missatges i augmentarà l’ús de la bateria.</string>
     <string name="title_no_utf8">Aquest proveïdor no és compatible amb UTF-8</string>
     <string name="title_no_sync">Errors de sincronització des de %1$s</string>
-    <string name="title_authorization_required">Es requereix autorització</string>
     <string name="title_identity_required">Cal enviar una identitat per enviar missatges</string>
     <string name="title_drafts_required">Cal enviar una carpeta d\'esborranys per enviar missatges</string>
     <string name="title_account_delete">Esborrar aquest compte per sempre?</string>
@@ -358,6 +356,8 @@
     <string name="title_pop3_support">POP3 no està suportat</string>
     <string name="title_activesync_support">ActiveSync no està suportat</string>
     <string name="title_oauth_support">OAuth no està suportat</string>
+    <string name="title_authorize">Autoritzar</string>
+    <string name="title_authorizing">S\'està autoritzant &#8230;</string>
     <string name="title_synchronize_now">Sincronitza ara</string>
     <string name="title_synchronize_all">Sincronitza tots els missatges</string>
     <string name="title_synchronize_enabled">Sincronitza</string>
@@ -405,8 +405,8 @@
     <string name="title_folder_user">Usuari</string>
     <string name="title_folder_primary">Carpetes del compte primari</string>
     <string name="title_folders_unified">Carpetes unificades de la safata d\'entrada</string>
-    <string name="title_no_messages">No hi ha missatges</string>
     <string name="title_no_folders">No carpetes</string>
+    <string name="title_no_messages">No hi ha missatges</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Rv: %1$s</string>
     <string name="title_seen">Marca com a llegit</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index e9ebfdbe59..e79362848d 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -129,7 +129,6 @@
     <string name="title_setup_quick_smtp">SMTP server pro odesílání zpráv</string>
     <string name="title_setup_go">Přejít</string>
     <string name="title_setup_wizard">Průvodce</string>
-    <string name="title_authorizing">Probíhá autorizace &#8230;</string>
     <string name="title_setup_instructions">Pokyny pro nastavení</string>
     <string name="title_setup_no_settings">Pro doménu \'%1$s\' nebylo nalezeno žádné nastavení</string>
     <string name="title_setup_quick_success">Účet a identita byly úspěšně přidány</string>
@@ -370,7 +369,6 @@
     <string name="title_no_idle">Tento poskytovatel nepodporuje okamžité zprávy. Následkem bude opožděný příjem nových zpráv a zvýšená spotřeba baterie.</string>
     <string name="title_no_utf8">Tento poskytovatel nepodporuje UTF-8</string>
     <string name="title_no_sync">Chyby synchronizace od %1$s</string>
-    <string name="title_authorization_required">Vyžadována autorizace</string>
     <string name="title_identity_required">Identita je nutná pro odesílání zpráv</string>
     <string name="title_drafts_required">Složka konceptů je nutná pro odesílání zpráv</string>
     <string name="title_account_delete">Trvale smazat tento účet?</string>
@@ -380,6 +378,7 @@
     <string name="title_pop3_support">POP3 není podporován</string>
     <string name="title_activesync_support">ActiveSync není podporován</string>
     <string name="title_oauth_support">OAuth není podporováno</string>
+    <string name="title_authorizing">Probíhá autorizace &#8230;</string>
     <string name="title_synchronize_now">Synchronizovat nyní</string>
     <string name="title_synchronize_all">Synchronizovat všechny zprávy</string>
     <string name="title_synchronize_enabled">Synchronizovat</string>
@@ -427,8 +426,8 @@
     <string name="title_folder_user">Uživatel</string>
     <string name="title_folder_primary">Hlavní účet složky</string>
     <string name="title_folders_unified">Složky sjednocené doručené pošty</string>
-    <string name="title_no_messages">Žádné zprávy</string>
     <string name="title_no_folders">Žádné složky</string>
+    <string name="title_no_messages">Žádné zprávy</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Označit přečtené</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 510b2b38d1..a1bd6771cd 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -346,7 +346,6 @@
     <string name="title_no_idle">Denne udbyder understøtter ikke push-beskeder. Dette vil forsinke modtagelsen af nye beskeder samt forøge strømforbruget.</string>
     <string name="title_no_utf8">Denne udbyder understøtter ikke UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfejl siden %1$s</string>
-    <string name="title_authorization_required">Godkendelse kræves</string>
     <string name="title_identity_required">En identitet kræves for at kunne sende beskeder</string>
     <string name="title_drafts_required">Kladdemappe kræves for at kunne sende beskeder</string>
     <string name="title_account_delete">Slet denne konto permanent?</string>
@@ -356,6 +355,8 @@
     <string name="title_pop3_support">POP3 understøttes ikke</string>
     <string name="title_activesync_support">ActiveSync er uunderstøttet</string>
     <string name="title_oauth_support">OAuth er uunderstøttet</string>
+    <string name="title_authorize">Godkend</string>
+    <string name="title_authorizing">Godkender &#8230;</string>
     <string name="title_synchronize_now">Synkronisér nu</string>
     <string name="title_synchronize_all">Synkronisér alle beskeder</string>
     <string name="title_synchronize_enabled">Synkroniserer</string>
@@ -403,8 +404,8 @@
     <string name="title_folder_user">Bruger</string>
     <string name="title_folder_primary">Primærkontomapper</string>
     <string name="title_folders_unified">Saml indbakkemapper</string>
-    <string name="title_no_messages">Ingen beskeder</string>
     <string name="title_no_folders">Ingen mapper</string>
+    <string name="title_no_messages">Ingen beskeder</string>
     <string name="title_subject_reply">Sv: %1$s</string>
     <string name="title_subject_forward">Vs: %1$s</string>
     <string name="title_seen">Markér som læst</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 74e1a6a97d..40555235f5 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -106,7 +106,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_setup_quick_smtp">SMTP-Server zum Senden von Nachrichten</string>
     <string name="title_setup_go">Los</string>
     <string name="title_setup_wizard">Assistent</string>
-    <string name="title_authorizing">Konto autorisieren &#8230;</string>
     <string name="title_setup_instructions">Einrichtungsanleitung</string>
     <string name="title_setup_no_settings">Keine Einstellungen für Domain „%1$s” gefunden</string>
     <string name="title_setup_quick_success">Ein Konto und eine Identität wurden erfolgreich hinzugefügt</string>
@@ -347,7 +346,6 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_no_idle">Dieser Anbieter unterstützt keine Pushnachrichten. Dies verzögert den Empfang neuer E-Mails und erhöht den Akkuverbrauch.</string>
     <string name="title_no_utf8">Dieser Anbieter unterstützt UTF-8 nicht</string>
     <string name="title_no_sync">Synchronisationsfehler seit %1$s</string>
-    <string name="title_authorization_required">Autorisierung erforderlich</string>
     <string name="title_identity_required">Für das Senden von Nachrichten ist das Erstellen einer Identität erforderlich</string>
     <string name="title_drafts_required">Ein Entwürfe-Ordner ist erforderlich, um Nachrichten zu senden</string>
     <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
@@ -357,6 +355,8 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_pop3_support">POP3 wird nicht unterstützt</string>
     <string name="title_activesync_support">ActiveSync wird nicht unterstützt</string>
     <string name="title_oauth_support">OAuth wird nicht unterstützt</string>
+    <string name="title_authorize">Autorisieren</string>
+    <string name="title_authorizing">Konto autorisieren &#8230;</string>
     <string name="title_synchronize_now">Jetzt synchronisieren</string>
     <string name="title_synchronize_all">Alle Nachrichten synchronisieren</string>
     <string name="title_synchronize_enabled">Synchronisieren</string>
@@ -404,8 +404,8 @@ Konten und Identitäten (Aliase) können bei Bedarf auch manuell eingerichtet we
     <string name="title_folder_user">Benutzer</string>
     <string name="title_folder_primary">Ordner primäres Konto</string>
     <string name="title_folders_unified">Sammeleingangsordner</string>
-    <string name="title_no_messages">Keine E-Mails</string>
     <string name="title_no_folders">Keine Ordner</string>
+    <string name="title_no_messages">Keine E-Mails</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Als gelesen kennzeichnen</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 16ea22ee5b..8e0ab21809 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -107,7 +107,8 @@
     <string name="title_setup_quick_smtp">Servidor SMTP para enviar mensajes</string>
     <string name="title_setup_go">Comenzar</string>
     <string name="title_setup_wizard">Asistente</string>
-    <string name="title_authorizing">Autorizando &#8230;</string>
+    <string name="title_setup_other">Otro proveedor</string>
+    <string name="title_setup_gmail_rationale">Por favor, conceda permisos para seleccionar una cuenta y leer su nombre</string>
     <string name="title_setup_instructions">Instrucciones de configuración</string>
     <string name="title_setup_no_settings">No se encontraron ajustes para el dominio \'%1$s\'</string>
     <string name="title_setup_quick_success">Una cuenta y una identidad han sido añadidas con éxito</string>
@@ -348,7 +349,6 @@
     <string name="title_no_idle">Este proveedor no es compatible con mensajes push. Esto retrasará la recepción de nuevos mensajes y aumentará el uso de batería.</string>
     <string name="title_no_utf8">Este proveedor no es compatible con UTF-8</string>
     <string name="title_no_sync">Errores de sincronización desde %1$s</string>
-    <string name="title_authorization_required">Autorización requerida</string>
     <string name="title_identity_required">Se requiere una identidad para enviar mensajes</string>
     <string name="title_drafts_required">Una carpeta de borradores es necesaria para enviar mensajes</string>
     <string name="title_account_delete">¿Eliminar esta cuenta permanentemente?</string>
@@ -358,6 +358,8 @@
     <string name="title_pop3_support">POP3 no es compatible</string>
     <string name="title_activesync_support">ActiveSync no es compatible</string>
     <string name="title_oauth_support">OAuth no está soportado</string>
+    <string name="title_authorize">Autorizar</string>
+    <string name="title_authorizing">Autorizando &#8230;</string>
     <string name="title_synchronize_now">Sincronizar ahora</string>
     <string name="title_synchronize_all">Sincronizar todos los mensajes</string>
     <string name="title_synchronize_enabled">Sincronizar</string>
@@ -405,8 +407,9 @@
     <string name="title_folder_user">Usuario</string>
     <string name="title_folder_primary">Cuenta primaria de carpetas</string>
     <string name="title_folders_unified">Carpetas de bandeja de entrada unificada</string>
-    <string name="title_no_messages">Sin mensajes</string>
     <string name="title_no_folders">No hay carpetas</string>
+    <string name="title_no_messages">Sin mensajes</string>
+    <string name="title_filters_active">Uno o más filtros activos</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Marcar como leído</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index f84bd3c505..b6408aed9c 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -107,7 +107,6 @@
     <string name="title_setup_quick_smtp">SMTP-palvelin viestien lähettämiseen</string>
     <string name="title_setup_go">Aloita</string>
     <string name="title_setup_wizard">Asetusvelho</string>
-    <string name="title_authorizing">Valtuutetaan &#8230;</string>
     <string name="title_setup_instructions">Asetusohjeet</string>
     <string name="title_setup_no_settings">Asetuksia ei löytynyt verkkotunnukselle \'%1$s\'</string>
     <string name="title_setup_quick_success">Tili ja identiteetti on lisätty onnistuneesti</string>
@@ -348,7 +347,6 @@
     <string name="title_no_idle">Tämä palveluntarjoaja ei tue push-viestejä. Tämä viivästyttää uusien viestien vastaanottamista ja lisää akun käyttöä.</string>
     <string name="title_no_utf8">Tämä palveluntarjoaja ei tue UTF-8:aa</string>
     <string name="title_no_sync">Synkronointivirheitä alkaen %1$s</string>
-    <string name="title_authorization_required">Valtuutus vaaditaan</string>
     <string name="title_identity_required">Viestien lähettämiseen tarvitaan identiteetti</string>
     <string name="title_drafts_required">Viestien lähettämiseen tarvitaan luonnoskansio</string>
     <string name="title_account_delete">Poistetaanko tämä tili pysyvästi?</string>
@@ -358,6 +356,8 @@
     <string name="title_pop3_support">POP3 ei ole tuettu</string>
     <string name="title_activesync_support">ActiveSync ei ole tuettu</string>
     <string name="title_oauth_support">OAuth ei ole tuettu</string>
+    <string name="title_authorize">Valtuuta</string>
+    <string name="title_authorizing">Valtuutetaan &#8230;</string>
     <string name="title_synchronize_now">Synkronoi nyt</string>
     <string name="title_synchronize_all">Synkronoi kaikki viestit</string>
     <string name="title_synchronize_enabled">Synkronoi</string>
@@ -405,8 +405,8 @@
     <string name="title_folder_user">Käyttäjä</string>
     <string name="title_folder_primary">Kansion ensisijainen tili</string>
     <string name="title_folders_unified">Yhdistetyn saapuneet-kansion kansiot</string>
-    <string name="title_no_messages">Ei viestejä</string>
     <string name="title_no_folders">Ei kansioita</string>
+    <string name="title_no_messages">Ei viestejä</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Merkitse luetuksi</string>
@@ -728,6 +728,7 @@
     <string name="title_1hour">1 tunti</string>
     <string name="title_1day">1 päivä</string>
     <string name="title_now">Nyt</string>
+    <string name="title_after">%1$s päästä</string>
     <string name="title_reset">Palauta oletukset</string>
     <string name="title_icalendar_accept">Hyväksy</string>
     <string name="title_icalendar_decline">Hylkää</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index a715befe5a..5e9f490435 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -107,7 +107,8 @@
     <string name="title_setup_quick_smtp">Serveur SMTP pour envoyer des messages</string>
     <string name="title_setup_go">Aller</string>
     <string name="title_setup_wizard">Assistant</string>
-    <string name="title_authorizing">Autorisation de &#8230;</string>
+    <string name="title_setup_other">Autre fournisseur</string>
+    <string name="title_setup_gmail_rationale">Veuillez accorder les autorisations pour sélectionner un compte et lire votre nom</string>
     <string name="title_setup_instructions">Instructions de configuration</string>
     <string name="title_setup_no_settings">Aucun paramètre trouvé pour le domaine \'%1$s\'</string>
     <string name="title_setup_quick_success">Un compte et une identité ont été ajoutés avec succès</string>
@@ -348,7 +349,6 @@
     <string name="title_no_idle">Ce fournisseur ne gère pas les messages en mode push. Cela va retarder la réception de nouveaux messages et augmenter l\'utilisation de la batterie.</string>
     <string name="title_no_utf8">Ce fournisseur ne prend pas en charge l\'UTF-8</string>
     <string name="title_no_sync">Erreurs de synchronisation depuis %1$s</string>
-    <string name="title_authorization_required">Autorisation requise</string>
     <string name="title_identity_required">Une identité est nécessaire pour envoyer des messages</string>
     <string name="title_drafts_required">Un dossier brouillon est nécessaire pour envoyer des messages</string>
     <string name="title_account_delete">Supprimer définitivement ce compte ?</string>
@@ -358,6 +358,8 @@
     <string name="title_pop3_support">POP3 n\'est pas supporté</string>
     <string name="title_activesync_support">ActiveSync n\'est pas pris en charge</string>
     <string name="title_oauth_support">OAuth n\'est pas pris en charge</string>
+    <string name="title_authorize">Autoriser</string>
+    <string name="title_authorizing">Autorisation de &#8230;</string>
     <string name="title_synchronize_now">Synchroniser maintenant</string>
     <string name="title_synchronize_all">Synchroniser tous les messages</string>
     <string name="title_synchronize_enabled">Synchroniser</string>
@@ -405,8 +407,9 @@
     <string name="title_folder_user">Utilisateur</string>
     <string name="title_folder_primary">Dossiers du compte principal</string>
     <string name="title_folders_unified">Dossiers de la boîte de réception unifiée</string>
-    <string name="title_no_messages">Aucun message</string>
     <string name="title_no_folders">Aucun dossier</string>
+    <string name="title_no_messages">Aucun message</string>
+    <string name="title_filters_active">Un ou plusieurs filtres actifs</string>
     <string name="title_subject_reply">Re : %1$s</string>
     <string name="title_subject_forward">Tr : %1$s</string>
     <string name="title_seen">Marquer comme lu</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 0daac6fb58..87a5ee5654 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -117,7 +117,6 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_setup_quick_smtp">SMTP server za slanje poruka</string>
     <string name="title_setup_go">Idi</string>
     <string name="title_setup_wizard">Asistent</string>
-    <string name="title_authorizing">Autorizira &#8230;</string>
     <string name="title_setup_instructions">Upute za postavljanje</string>
     <string name="title_setup_no_settings">Nije pronađena nijedna postavka za domenu \'%1$s\'</string>
     <string name="title_setup_quick_success">Račun i identitet uspješno su dodani</string>
@@ -358,7 +357,6 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_no_idle">Ovaj davatelj usluga ne podržava push poruke. To će odgoditi prijem novih poruka i povećati potrošnju baterije.</string>
     <string name="title_no_utf8">Ovaj davatelj ne podržava UTF-8</string>
     <string name="title_no_sync">Pogreške sinkronizacije od %1$s</string>
-    <string name="title_authorization_required">Autorizacija je potrebna</string>
     <string name="title_identity_required">Za slanje poruka potreban je identitet</string>
     <string name="title_drafts_required">Za slanje poruka potrebna je mapa skica</string>
     <string name="title_account_delete">Želite li trajno izbrisati ovaj račun?</string>
@@ -368,6 +366,7 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_pop3_support">POP3 nije podržan</string>
     <string name="title_activesync_support">ActiveSync nije podržan</string>
     <string name="title_oauth_support">OAuth nije podržan</string>
+    <string name="title_authorizing">Autorizira &#8230;</string>
     <string name="title_synchronize_now">Sinkroniziraj sada</string>
     <string name="title_synchronize_all">Sinkroniziraj sve poruke</string>
     <string name="title_synchronize_enabled">Sinkroniziraj</string>
@@ -415,8 +414,8 @@ Ako je potrebno, računi i identiteti (aliasi) mogu se postaviti i ručno.    </
     <string name="title_folder_user">Korisnik</string>
     <string name="title_folder_primary">Mapa primarnog računa</string>
     <string name="title_folders_unified">Mape objedinjenog ulaznog spremnika</string>
-    <string name="title_no_messages">Nema poruka</string>
     <string name="title_no_folders">Nema mapa</string>
+    <string name="title_no_messages">Nema poruka</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Npr: %1$s</string>
     <string name="title_seen">Označi pročitano</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index e15c766f99..5993841de3 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -106,7 +106,8 @@
     <string name="title_setup_quick_smtp">Server SMTP per inviare messaggi</string>
     <string name="title_setup_go">Vai</string>
     <string name="title_setup_wizard">Wizard</string>
-    <string name="title_authorizing">Autorizzazione &#8230;</string>
+    <string name="title_setup_other">Altro provider</string>
+    <string name="title_setup_gmail_rationale">Si prega di concedere i permessi per selezionare un account e leggere il tuo nome</string>
     <string name="title_setup_instructions">Istruzioni di configurazione</string>
     <string name="title_setup_no_settings">Nessuna impostazione trovata per il dominio \'%1$s\'</string>
     <string name="title_setup_quick_success">Un account e un\'identità sono stati aggiunti con successo</string>
@@ -347,7 +348,6 @@
     <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>
     <string name="title_no_utf8">Questo provider non supporta UTF-8</string>
     <string name="title_no_sync">Errori di sincronizzazione da %1$s</string>
-    <string name="title_authorization_required">Autorizzazione richiesta</string>
     <string name="title_identity_required">È necessaria un\'identità per inviare messaggi</string>
     <string name="title_drafts_required">Per inviare messaggi è necessaria una cartella bozze</string>
     <string name="title_account_delete">Eliminare questo account permanentemente?</string>
@@ -357,6 +357,8 @@
     <string name="title_pop3_support">POP3 non è supportato</string>
     <string name="title_activesync_support">ActiveSync non è supportato</string>
     <string name="title_oauth_support">OAuth non è supportato</string>
+    <string name="title_authorize">Autorizza</string>
+    <string name="title_authorizing">Autorizzazione &#8230;</string>
     <string name="title_synchronize_now">Sincronizza ora</string>
     <string name="title_synchronize_all">Sincronizza tutti i messaggi</string>
     <string name="title_synchronize_enabled">Sincronizza</string>
@@ -404,8 +406,9 @@
     <string name="title_folder_user">Utente</string>
     <string name="title_folder_primary">Cartelle account principale</string>
     <string name="title_folders_unified">Cartella posta in arrivo unificata</string>
-    <string name="title_no_messages">Nessun messaggio</string>
     <string name="title_no_folders">Nessuna cartella</string>
+    <string name="title_no_messages">Nessun messaggio</string>
+    <string name="title_filters_active">Uno o più filtri attivi</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Segna come letto</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index ed00f1ca88..ee4fa59d19 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -107,7 +107,8 @@
     <string name="title_setup_quick_smtp">SMTP-server om berichten te verzenden</string>
     <string name="title_setup_go">Ga</string>
     <string name="title_setup_wizard">Wizard</string>
-    <string name="title_authorizing">Autoriseren &#8230;</string>
+    <string name="title_setup_other">Andere provider</string>
+    <string name="title_setup_gmail_rationale">Geef a.u.b. toestemming om een account te selecteren en uw naam te lezen</string>
     <string name="title_setup_instructions">Installatie-instructies</string>
     <string name="title_setup_no_settings">Geen instellingen gevonden voor domein \'%1$s\'</string>
     <string name="title_setup_quick_success">Een account en een identiteit zijn succesvol toegevoegd</string>
@@ -348,7 +349,6 @@
     <string name="title_no_idle">Deze provider biedt geen ondersteuning voor push-berichten. Dit zal het ontvangen van nieuwe berichten vertragen en het gebruik van de batterij te verhogen.</string>
     <string name="title_no_utf8">Deze provider ondersteunt geen UTF-8</string>
     <string name="title_no_sync">Synchronisatiefouten sinds %1$s</string>
-    <string name="title_authorization_required">Autorisatie vereist</string>
     <string name="title_identity_required">Een identiteit is vereist om berichten te verzenden</string>
     <string name="title_drafts_required">Een concepten map is vereist om berichten te verzenden</string>
     <string name="title_account_delete">Verwijder dit account permanent?</string>
@@ -358,6 +358,8 @@
     <string name="title_pop3_support">POP wordt niet ondersteund</string>
     <string name="title_activesync_support">ActiveSync wordt niet ondersteund</string>
     <string name="title_oauth_support">OAuth wordt niet ondersteund</string>
+    <string name="title_authorize">Autoriseren</string>
+    <string name="title_authorizing">Autoriseren &#8230;</string>
     <string name="title_synchronize_now">Nu synchroniseren</string>
     <string name="title_synchronize_all">Alle berichten synchroniseren</string>
     <string name="title_synchronize_enabled">Synchroniseren</string>
@@ -405,8 +407,9 @@
     <string name="title_folder_user">Gebruiker</string>
     <string name="title_folder_primary">Mappen primaire account</string>
     <string name="title_folders_unified">Gecombineerde postvak in mappen</string>
-    <string name="title_no_messages">Geen berichten</string>
     <string name="title_no_folders">Geen mappen</string>
+    <string name="title_no_messages">Geen berichten</string>
+    <string name="title_filters_active">Een of meer filters actief</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Markeer als gelezen</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index e232831a6b..6ccabece62 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -107,7 +107,8 @@
     <string name="title_setup_quick_smtp">SMTP-server for å sende meldinger</string>
     <string name="title_setup_go">Utfør</string>
     <string name="title_setup_wizard">Veiviser</string>
-    <string name="title_authorizing">Autoriserer &#8230;</string>
+    <string name="title_setup_other">Annen leverandør</string>
+    <string name="title_setup_gmail_rationale">Gi tillatelser til å velge en konto og lese navnet ditt</string>
     <string name="title_setup_instructions">Oppsett instruksjoner</string>
     <string name="title_setup_no_settings">Ingen innstillinger funnet for domene \'%1$s\'</string>
     <string name="title_setup_quick_success">En konto og en identitet har blitt lagt til</string>
@@ -348,7 +349,6 @@
     <string name="title_no_idle">Denne leverandøren støtter ikke push-meldinger. Dette vil forsinke mottak av nye meldinger og øke batteriforbruket.</string>
     <string name="title_no_utf8">Denne leverandøren støtter ikke UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfeil siden %1$s</string>
-    <string name="title_authorization_required">Godkjenning kreves</string>
     <string name="title_identity_required">En identitet er nødvendig for å sende meldinger</string>
     <string name="title_drafts_required">Det kreves en kladd mappe for å kunne sende meldinger</string>
     <string name="title_account_delete">Slett denne konto en permanent?</string>
@@ -358,6 +358,8 @@
     <string name="title_pop3_support">POP3 støttes ikke</string>
     <string name="title_activesync_support">ActiveSync støttes ikke</string>
     <string name="title_oauth_support">OAuth støttes ikke</string>
+    <string name="title_authorize">Godkjenne</string>
+    <string name="title_authorizing">Autoriserer &#8230;</string>
     <string name="title_synchronize_now">Synkroniser nå</string>
     <string name="title_synchronize_all">Synkroniser alle meldinger</string>
     <string name="title_synchronize_enabled">Synkroniser</string>
@@ -405,8 +407,9 @@
     <string name="title_folder_user">Bruker</string>
     <string name="title_folder_primary">Mapper primærkonto</string>
     <string name="title_folders_unified">Enhetlig Innboks mapper</string>
-    <string name="title_no_messages">Ingen meldinger</string>
     <string name="title_no_folders">Ingen mapper</string>
+    <string name="title_no_messages">Ingen meldinger</string>
+    <string name="title_filters_active">En eller flere filtre aktive</string>
     <string name="title_subject_reply">Sv: %1$s</string>
     <string name="title_subject_forward">Videresend: %1$s</string>
     <string name="title_seen">Merk som lest</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index e232831a6b..6ccabece62 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -107,7 +107,8 @@
     <string name="title_setup_quick_smtp">SMTP-server for å sende meldinger</string>
     <string name="title_setup_go">Utfør</string>
     <string name="title_setup_wizard">Veiviser</string>
-    <string name="title_authorizing">Autoriserer &#8230;</string>
+    <string name="title_setup_other">Annen leverandør</string>
+    <string name="title_setup_gmail_rationale">Gi tillatelser til å velge en konto og lese navnet ditt</string>
     <string name="title_setup_instructions">Oppsett instruksjoner</string>
     <string name="title_setup_no_settings">Ingen innstillinger funnet for domene \'%1$s\'</string>
     <string name="title_setup_quick_success">En konto og en identitet har blitt lagt til</string>
@@ -348,7 +349,6 @@
     <string name="title_no_idle">Denne leverandøren støtter ikke push-meldinger. Dette vil forsinke mottak av nye meldinger og øke batteriforbruket.</string>
     <string name="title_no_utf8">Denne leverandøren støtter ikke UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfeil siden %1$s</string>
-    <string name="title_authorization_required">Godkjenning kreves</string>
     <string name="title_identity_required">En identitet er nødvendig for å sende meldinger</string>
     <string name="title_drafts_required">Det kreves en kladd mappe for å kunne sende meldinger</string>
     <string name="title_account_delete">Slett denne konto en permanent?</string>
@@ -358,6 +358,8 @@
     <string name="title_pop3_support">POP3 støttes ikke</string>
     <string name="title_activesync_support">ActiveSync støttes ikke</string>
     <string name="title_oauth_support">OAuth støttes ikke</string>
+    <string name="title_authorize">Godkjenne</string>
+    <string name="title_authorizing">Autoriserer &#8230;</string>
     <string name="title_synchronize_now">Synkroniser nå</string>
     <string name="title_synchronize_all">Synkroniser alle meldinger</string>
     <string name="title_synchronize_enabled">Synkroniser</string>
@@ -405,8 +407,9 @@
     <string name="title_folder_user">Bruker</string>
     <string name="title_folder_primary">Mapper primærkonto</string>
     <string name="title_folders_unified">Enhetlig Innboks mapper</string>
-    <string name="title_no_messages">Ingen meldinger</string>
     <string name="title_no_folders">Ingen mapper</string>
+    <string name="title_no_messages">Ingen meldinger</string>
+    <string name="title_filters_active">En eller flere filtre aktive</string>
     <string name="title_subject_reply">Sv: %1$s</string>
     <string name="title_subject_forward">Videresend: %1$s</string>
     <string name="title_seen">Merk som lest</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 02be944d5b..57d3e1aa64 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -369,7 +369,6 @@
     <string name="title_no_idle">Ten dostawca nie obsługuje wiadomości push. To opóźni otrzymywanie nowych wiadomości i zwiększy zużycie baterii.</string>
     <string name="title_no_utf8">Ten dostawca nie wspiera UTF-8</string>
     <string name="title_no_sync">Błędy synchornizacji od %1$s</string>
-    <string name="title_authorization_required">Wymagana autoryzacja</string>
     <string name="title_identity_required">Do wysyłania wiadomości wymagana jest tożsamość</string>
     <string name="title_drafts_required">Folder szkiców jest wymagany do wysyłania wiadomości</string>
     <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
@@ -426,8 +425,8 @@
     <string name="title_folder_user">Użytkownik</string>
     <string name="title_folder_primary">Podstawowe konto folderów</string>
     <string name="title_folders_unified">Wspólne foldery</string>
-    <string name="title_no_messages">Brak wiadomości</string>
     <string name="title_no_folders">Brak folderów</string>
+    <string name="title_no_messages">Brak wiadomości</string>
     <string name="title_subject_reply">Odp: %1$s</string>
     <string name="title_subject_forward">Pd: %1$s</string>
     <string name="title_seen">Oznacz jako przeczytane</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 240d055b28..f9eada01fd 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -327,7 +327,6 @@
     <string name="title_no_idle">Este provedor não suporta mensagens push. Isso irá atrasar o recebimento de novas mensagens e aumentar o uso da bateria.</string>
     <string name="title_no_utf8">Este provedor de e-mail não suporta UTF-8</string>
     <string name="title_no_sync">Erros de sincronização desde %1$s</string>
-    <string name="title_authorization_required">Autorização necessária</string>
     <string name="title_identity_required">Uma identidade é necessária para enviar mensagens</string>
     <string name="title_drafts_required">Uma pasta de rascunhos é necessário para enviar mensagens</string>
     <string name="title_account_delete">Excluir esta conta permanentemente?</string>
@@ -382,8 +381,8 @@
     <string name="title_folder_user">Usuário</string>
     <string name="title_folder_primary">Conta principal de pastas</string>
     <string name="title_folders_unified">Pastas de caixa de entrada unificada</string>
-    <string name="title_no_messages">Sem mensagens</string>
     <string name="title_no_folders">Sem pastas</string>
+    <string name="title_no_messages">Sem mensagens</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Enc: %1$s</string>
     <string name="title_seen">Marcar como lida</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index c50c388478..9925f5c64b 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -358,7 +358,6 @@
     <string name="title_no_idle">Acest furnizor de servicii e-mail nu suporta mesaje push. Acest fapt va duce la întârzierea recepției mesajelor și un consum mai mare al bateriei.</string>
     <string name="title_no_utf8">Acest furnizor nu suportă UTF-8</string>
     <string name="title_no_sync">Erori de sincronizare începând cu %1$s</string>
-    <string name="title_authorization_required">Autorizare necesară</string>
     <string name="title_identity_required">O identitate este necesară pentru a trimite mesaje</string>
     <string name="title_drafts_required">Un dosar de ciorne este necesar pentru a trimite mesaje</string>
     <string name="title_account_delete">Ștergeți definitiv acest cont?</string>
@@ -415,8 +414,8 @@
     <string name="title_folder_user">Utilizator</string>
     <string name="title_folder_primary">Dosare cont primar</string>
     <string name="title_folders_unified">Director unificat de mesaje primite</string>
-    <string name="title_no_messages">Nici un mesaj</string>
     <string name="title_no_folders">Nici un dosar</string>
+    <string name="title_no_messages">Nici un mesaj</string>
     <string name="title_subject_reply">Răsp: %1$s</string>
     <string name="title_subject_forward">Redir: %1$s</string>
     <string name="title_seen">Marcare ca citit</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index b62ad6bbee..ceae1dd81b 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -354,7 +354,6 @@
     <string name="title_no_idle">Этот провайдер не поддерживает push-сообщения. Это задержит прием новых сообщений и увеличит расход заряда батареи.</string>
     <string name="title_no_utf8">Этот провайдер не поддерживает UTF-8</string>
     <string name="title_no_sync">Ошибки синхронизации после %1$s</string>
-    <string name="title_authorization_required">Требуется авторизация</string>
     <string name="title_identity_required">Для отправки сообщений требуется идентификатор</string>
     <string name="title_drafts_required">Для отправки сообщений требуется папка черновиков</string>
     <string name="title_account_delete">Удалить эту учетную запись навсегда?</string>
@@ -409,8 +408,8 @@
     <string name="title_folder_user">Пользователь</string>
     <string name="title_folder_primary">Папки основной учетной записи</string>
     <string name="title_folders_unified">Папки единого почтового ящика</string>
-    <string name="title_no_messages">Нет сообщений</string>
     <string name="title_no_folders">Нет папок</string>
+    <string name="title_no_messages">Нет сообщений</string>
     <string name="title_subject_reply">Re: %1$s</string>
     <string name="title_subject_forward">Fwd: %1$s</string>
     <string name="title_seen">Отметить как прочитанное</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 9613ddd52c..7f91249f44 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -332,7 +332,6 @@
     <string name="title_no_idle">Leverantören stöder inte push-meddelanden. Detta kommer att fördröja mottagning av nya meddelanden och öka batterianvändningen.</string>
     <string name="title_no_utf8">Denna leverantör stöder inte UTF-8</string>
     <string name="title_no_sync">Synkroniseringsfel sedan %1$s</string>
-    <string name="title_authorization_required">Tillstånd krävs</string>
     <string name="title_identity_required">En identitet krävs för att skicka meddelanden</string>
     <string name="title_drafts_required">En mapp för utkast krävs för att skicka meddelanden</string>
     <string name="title_account_delete">Ta bort detta konto permanent?</string>
@@ -387,8 +386,8 @@
     <string name="title_folder_user">Användare</string>
     <string name="title_folder_primary">Mappar primärt konto</string>
     <string name="title_folders_unified">Samlad inkorg mappar</string>
-    <string name="title_no_messages">Inga meddelanden</string>
     <string name="title_no_folders">Inga mappar</string>
+    <string name="title_no_messages">Inga meddelanden</string>
     <string name="title_subject_reply">Sv: %1$s</string>
     <string name="title_subject_forward">Vb: %1$s</string>
     <string name="title_seen">Märk som läst</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index cdb8e7b782..2919c7a99b 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -332,7 +332,6 @@
     <string name="title_no_idle">Bu sağlayıcı anlık mesajları desteklemiyor. Bu, yeni mesajların alınmasını geciktirecek ve pil kullanımını artıracaktır.</string>
     <string name="title_no_utf8">Bu sağlayıcı UTF-8\'i desteklemiyor</string>
     <string name="title_no_sync">%1$s\'den beri eşzamanlama hataları</string>
-    <string name="title_authorization_required">Yetkilendirme gerekli</string>
     <string name="title_identity_required">İleti göndermek için bir kimlik gerekli</string>
     <string name="title_drafts_required">İleti göndermek için taslaklar klasörü gerekir</string>
     <string name="title_account_delete">Bu hesap kalıcı olarak silinsin mi?</string>
@@ -388,8 +387,8 @@
     <string name="title_folder_user">Kullanıcı</string>
     <string name="title_folder_primary">Klasörler birincil hesap</string>
     <string name="title_folders_unified">Birleşik gelen kutusu klasörleri</string>
-    <string name="title_no_messages">İleti yok</string>
     <string name="title_no_folders">Klasör yok</string>
+    <string name="title_no_messages">İleti yok</string>
     <string name="title_subject_reply">Ynt: %1$s</string>
     <string name="title_subject_forward">İlet: %1$s</string>
     <string name="title_seen">Okundu olarak işaretle</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 9c71a6b3a9..db417c3da5 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -95,7 +95,8 @@
     <string name="title_setup_quick_smtp">发送消息的SMTP服务器</string>
     <string name="title_setup_go">转到</string>
     <string name="title_setup_wizard">向导</string>
-    <string name="title_authorizing">授权中 &#8230;</string>
+    <string name="title_setup_other">其他邮件服务提供商</string>
+    <string name="title_setup_gmail_rationale">请授予权限来选择一个帐户并读取您的姓名</string>
     <string name="title_setup_instructions">设置指南</string>
     <string name="title_setup_no_settings">找不到 \"%1$s\" 的设置</string>
     <string name="title_setup_quick_success">已成功添加了一个账户和身份</string>
@@ -336,7 +337,6 @@
     <string name="title_no_idle">该提供商不支持消息推送，这将延迟新消息的接收并增加电池用量</string>
     <string name="title_no_utf8">该邮件服务供应商不支持UTF-8字符集</string>
     <string name="title_no_sync">从 %1$s 开始同步错误</string>
-    <string name="title_authorization_required">需要授权</string>
     <string name="title_identity_required">需要一个身份来发送消息</string>
     <string name="title_drafts_required">需要一个草稿文件夹来发送消息</string>
     <string name="title_account_delete">确定永久删除这个账户吗？</string>
@@ -346,6 +346,8 @@
     <string name="title_pop3_support">不支持POP3协议</string>
     <string name="title_activesync_support">不支持ActiveSync</string>
     <string name="title_oauth_support">不支持OAuth</string>
+    <string name="title_authorize">授权</string>
+    <string name="title_authorizing">授权中 &#8230;</string>
     <string name="title_synchronize_now">现在同步</string>
     <string name="title_synchronize_all">同步所有消息</string>
     <string name="title_synchronize_enabled">同步</string>
@@ -393,8 +395,9 @@
     <string name="title_folder_user">用户</string>
     <string name="title_folder_primary">文件夹主账户</string>
     <string name="title_folders_unified">聚合收件箱文件夹</string>
-    <string name="title_no_messages">没有邮件</string>
     <string name="title_no_folders">无文件夹</string>
+    <string name="title_no_messages">没有邮件</string>
+    <string name="title_filters_active">一个或多个过滤器已启用</string>
     <string name="title_subject_reply">回复：%1$s</string>
     <string name="title_subject_forward">转发：%1$s</string>
     <string name="title_seen">标记为已读</string>