diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 5fddd9bed1..c1386afcb5 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -530,7 +530,6 @@
     <string name="title_queued">جارٍ إرسال الرسالة</string>
     <string name="title_encrypt">تعمية</string>
     <string name="title_decrypt">فك التعمية</string>
-    <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_signature_subject">الموضوع</string>
     <string name="title_search">بحث</string>
     <string name="title_search_with_unseen">غير مقروءة</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 19f3e74739..8b45fce1ac 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -548,7 +548,6 @@
     <string name="title_queued">جارٍ إرسال الرسالة</string>
     <string name="title_encrypt">تعمية</string>
     <string name="title_decrypt">فك التعمية</string>
-    <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_signature_subject">الموضوع</string>
     <string name="title_search">بحث</string>
     <string name="title_search_with_unseen">غير مقروءة</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index b2d562a7ad..db2194e7a1 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -602,7 +602,6 @@
     <string name="title_queued">جارٍ إرسال الرسالة</string>
     <string name="title_encrypt">تعمية</string>
     <string name="title_decrypt">فك التعمية</string>
-    <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_signature_subject">الموضوع</string>
     <string name="title_search">بحث</string>
     <string name="title_search_with_unseen">غير مقروءة</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 2aaf9110c5..642fe3bd8f 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -580,7 +580,6 @@
     <string name="title_queued">جارٍ إرسال الرسالة</string>
     <string name="title_encrypt">تعمية</string>
     <string name="title_decrypt">فك التعمية</string>
-    <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_signature_subject">الموضوع</string>
     <string name="title_search">بحث</string>
     <string name="title_search_with_unseen">غير مقروءة</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index f0dce5e2b8..43a1dfd3d7 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -544,7 +544,6 @@
     <string name="title_queued">جارٍ إرسال الرسالة</string>
     <string name="title_encrypt">تعمية</string>
     <string name="title_decrypt">فك التعمية</string>
-    <string name="title_no_openpgp">لم يتم العثور على OpenKeychain</string>
     <string name="title_signature_subject">الموضوع</string>
     <string name="title_search">بحث</string>
     <string name="title_search_with_unseen">غير مقروءة</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index f13d011d3c..43ed65ff05 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -1206,7 +1206,7 @@
     <string name="title_show_flagged">Ulduzlu mesaj sayını göstər</string>
     <string name="title_subscribed_only">Yalnız abunə olunanlar</string>
     <string name="title_sort_unread_atop">Oxunulmayanları üstdə sırala</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Sinxron formatda sırala</string>
+    <string name="title_sort_sync">Sinxron formatda sırala</string>
     <string name="title_search_folder">Qovluq axtar</string>
     <string name="title_apply_to_all">Hamısına tətbiq et</string>
     <string name="title_edit_account_name">Hesab adına düzəliş et</string>
@@ -1630,9 +1630,7 @@
     <string name="title_charset_auto">Avtomatik</string>
     <string name="title_alternative_text">Düz mətni yüklə</string>
     <string name="title_alternative_html">HTML-i yüklə</string>
-    <string name="title_no_openpgp">OpenKeychain tapılmadı</string>
     <string name="title_no_openpgp_remark">Əvvəlcə \"PGB bir ucdan digərinə qədər şifrələmə\" konfiqurasiya edilməlidir</string>
-    <string name="title_user_interaction">\"OpenKeychain\"ə köçürülür</string>
     <string name="title_padlock">Mesajın şifrəsini açmaq üçün asma kilid istifadə et</string>
     <string name="title_signed_data">Mesaj mətnini göstərmək üçün imzanı doğrula</string>
     <string name="title_not_encrypted">Mesaj imzalı və ya şifrələnmiş deyil</string>
diff --git a/app/src/main/res/values-be-rBY/strings.xml b/app/src/main/res/values-be-rBY/strings.xml
index aaa6b8487e..34ee69c7dc 100644
--- a/app/src/main/res/values-be-rBY/strings.xml
+++ b/app/src/main/res/values-be-rBY/strings.xml
@@ -1655,9 +1655,7 @@ Android можа запытаць дазвол на доступ да выбра
     <string name="title_charset_auto">Аўтаматычна</string>
     <string name="title_alternative_text">Загрузіць звычайны тэкст</string>
     <string name="title_alternative_html">Загрузіць HTML</string>
-    <string name="title_no_openpgp">OpenKeychain не знойдзена</string>
     <string name="title_no_openpgp_remark">Спачатку неабходна наладзіць скразное шыфраванне PGP</string>
-    <string name="title_user_interaction">Перанос на OpenKeychain</string>
     <string name="title_padlock">Выкарыстоўваць замок для расшыфроўкі паведамлення</string>
     <string name="title_signed_data">Для паказу тэксту паведамлення правяраць подпіс</string>
     <string name="title_not_encrypted">Паведамленне не падпісана і не зашыфравана</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index ae671a1a44..aa1ea11e6a 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -1603,9 +1603,7 @@
     <string name="title_charset_auto">Автоматично</string>
     <string name="title_alternative_text">Зареждане на прост текст</string>
     <string name="title_alternative_html">Зареждане на HTML</string>
-    <string name="title_no_openpgp">OpenKeychain не е намерена</string>
     <string name="title_no_openpgp_remark">Първо трябва да се настрои криптирането от край до край PGP</string>
-    <string name="title_user_interaction">Прехвърляне към OpenKeychain</string>
     <string name="title_padlock">Употреба на катинара за дешифриране на съобщението</string>
     <string name="title_signed_data">Потвърдете подписа, за да се покаже текста на съобщението</string>
     <string name="title_not_encrypted">Съобщението не е подписано или криптирано</string>
diff --git a/app/src/main/res/values-bs-rBA/strings.xml b/app/src/main/res/values-bs-rBA/strings.xml
index 05388ae27e..cebb5110cd 100644
--- a/app/src/main/res/values-bs-rBA/strings.xml
+++ b/app/src/main/res/values-bs-rBA/strings.xml
@@ -1218,7 +1218,7 @@
     <string name="title_show_flagged">Prikaži broj poruka sa zvjezdicom</string>
     <string name="title_subscribed_only">Samo pretplata</string>
     <string name="title_sort_unread_atop">Sortiraj nepročitane na vrh</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Sortiraj po sinhronizovanom</string>
+    <string name="title_sort_sync">Sortiraj po sinhronizovanom</string>
     <string name="title_search_folder">Traži folder</string>
     <string name="title_apply_to_all">Primijeni za sve</string>
     <string name="title_edit_account_name">Uredi ime računa</string>
@@ -1641,9 +1641,9 @@
     <string name="title_charset_auto">Automatski</string>
     <string name="title_alternative_text">Učitaj obični tekst</string>
     <string name="title_alternative_html">Učitaj HTML</string>
-    <string name="title_no_openpgp">OpenKeychan nije pronađen</string>
+    <string name="title_no_openpgp">Nije pronađen OpenPGP provajder</string>
     <string name="title_no_openpgp_remark">Potrebno je prvo podesiti PGP end-to-end šifriranje</string>
-    <string name="title_user_interaction">Prebacivanje na OpenKeychain</string>
+    <string name="title_user_interaction">Prebacivanje na OpenPGP provajdera</string>
     <string name="title_padlock">Koristi lokot za dešifriranje poruke</string>
     <string name="title_signed_data">Potvrdi potpis za prikazivanje teksta poruke</string>
     <string name="title_not_encrypted">Poruka nije potpisana niti šifrirana</string>
@@ -2026,6 +2026,7 @@
     <string name="title_hint_folder_sync">Da bi ograničili potrošnju baterije i podataka, po zadanom neće biti sinhronizirani svi folderi i poruke</string>
     <string name="title_hint_airplane">Način rada u avionu je uključen</string>
     <string name="title_hint_vpn_active">VPN aktivan</string>
+    <string name="title_hint_vpn_settings">Spisak VPN-ova</string>
     <string name="title_hint_notifications">Nema dozvola za notifikacije</string>
     <string name="title_hint_notifications_remark">Dozvole za obavještenja su neophodne i za upozorenja računa. Obavještenja za nove poruke mogu se isključiti u postavkama.</string>
     <string name="title_hint_battery_optimizations">Optimizacije baterije su još uključene</string>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 9d96d0abd9..c93d510fcb 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -1007,8 +1007,6 @@ Les opcions estan categoritzades per pestanya, dividides en seccions, organitzad
     <string name="title_encrypt">Xifra</string>
     <string name="title_decrypt">Desxifra</string>
     <string name="title_resync">Resincronitza</string>
-    <string name="title_no_openpgp">OpenKeychain no trobat</string>
-    <string name="title_user_interaction">Transferència a OpenKeychain</string>
     <string name="title_signed_data">Verifiqueu la signatura per mostrar el text del missatge</string>
     <string name="title_not_encrypted">El missatge no està signat o xifrat</string>
     <string name="title_no_sign_key">No s\'ha seleccionat cap clau de signe</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index e4fc5fbb07..dbcbc90607 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -1644,9 +1644,7 @@ v prohlížeči ze všech Google účtů.</string>
     <string name="title_charset_auto">Automaticky</string>
     <string name="title_alternative_text">Načíst prostý text</string>
     <string name="title_alternative_html">Načíst HTML</string>
-    <string name="title_no_openpgp">OpenKeychain nenalezena</string>
     <string name="title_no_openpgp_remark">PGP end-to-end šifrování musí být nejprve nakonfigurováno</string>
-    <string name="title_user_interaction">Přenášení do OpenKeychain</string>
     <string name="title_padlock">K dešifrování zprávy použijte zámek</string>
     <string name="title_signed_data">Ověřit podpis pro zobrazení textu zprávy</string>
     <string name="title_not_encrypted">Zpráva není podepsána ani šifrována</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 5a74f6c26b..17561f228e 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -1205,7 +1205,7 @@
     <string name="title_show_flagged">Vis stjernemarkerede beskedantal</string>
     <string name="title_subscribed_only">Abonnér på</string>
     <string name="title_sort_unread_atop">Sortér ulæst øverst</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Sortér efter synkronisering</string>
+    <string name="title_sort_sync">Sortér efter synkronisering</string>
     <string name="title_search_folder">Søg efter mappe</string>
     <string name="title_apply_to_all">Anvend på alle</string>
     <string name="title_edit_account_name">Redigér kontonavn</string>
@@ -1628,9 +1628,9 @@ For at slette vedhæftninger, opret en ny besked og slet den gamle.
     <string name="title_charset_auto">Automatisk</string>
     <string name="title_alternative_text">Indlæs simpel tekst</string>
     <string name="title_alternative_html">Indlæs HTML</string>
-    <string name="title_no_openpgp">OpenKeychain ikke fundet</string>
+    <string name="title_no_openpgp">OpenPGP-udbyder ikke fundet</string>
     <string name="title_no_openpgp_remark">PGP end-to-end kryptering skal opsættes først</string>
-    <string name="title_user_interaction">Overfører til OpenKeychain</string>
+    <string name="title_user_interaction">Overfører til OpenPGP-udbyder</string>
     <string name="title_padlock">Brug hængelåsen til at dekryptere beskeden</string>
     <string name="title_signed_data">Bekræft signaturen for at vise beskedtekst</string>
     <string name="title_not_encrypted">Besked er ikke signeret eller krypteret</string>
@@ -2013,6 +2013,7 @@ For at slette vedhæftninger, opret en ny besked og slet den gamle.
     <string name="title_hint_folder_sync">For at reducere strøm- og dataforbruget synkroniseres visse mapper og beskeder ikke som standard</string>
     <string name="title_hint_airplane">Flytilstand er Til</string>
     <string name="title_hint_vpn_active">VPN aktiv</string>
+    <string name="title_hint_vpn_settings">VPN-liste</string>
     <string name="title_hint_notifications">Ingen notifikationstilladelser</string>
     <string name="title_hint_notifications_remark">Notifikationstilladelser kræves også for (konto-)advarsler. Notifikationer til nye beskeder kan slås fra i indstillingerne.</string>
     <string name="title_hint_battery_optimizations">Batterioptimering er stadig slået til</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index a49465d5c4..3229852082 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1212,7 +1212,7 @@
     <string name="title_show_flagged">Anzahl markierter Nachrichten anzeigen</string>
     <string name="title_subscribed_only">Nur abonnierte</string>
     <string name="title_sort_unread_atop">Ungelesene oben einreihen</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Nach Synchronisation sortiert</string>
+    <string name="title_sort_sync">Nach Synchronisation sortiert</string>
     <string name="title_search_folder">Nach Ordnern suchen</string>
     <string name="title_apply_to_all">Für alle übernehmen</string>
     <string name="title_edit_account_name">Kontonamen ändern</string>
@@ -1637,9 +1637,9 @@
     <string name="title_charset_auto">Automatisch</string>
     <string name="title_alternative_text">Einfachen Text laden</string>
     <string name="title_alternative_html">HTML laden</string>
-    <string name="title_no_openpgp">OpenKeychain wurde nicht gefunden</string>
+    <string name="title_no_openpgp">OpenPGP-Anbieter nicht gefunden</string>
     <string name="title_no_openpgp_remark">PGP-Ende-zu-Ende-Verschlüsselung muss zuerst konfiguriert werden</string>
-    <string name="title_user_interaction">Übertragung zu OpenKeychain</string>
+    <string name="title_user_interaction">Übertragung zu einem OpenPGP-Anbieter</string>
     <string name="title_padlock">Vorhängeschloss zum Entschlüsseln der Nachricht verwenden</string>
     <string name="title_signed_data">Überprüfen Sie die Signatur, um den Nachrichtentext anzuzeigen</string>
     <string name="title_not_encrypted">Nachricht ist nicht signiert oder verschlüsselt</string>
@@ -2023,6 +2023,7 @@
     <string name="title_hint_folder_sync">Um Akkuverbrauch und Datennutzung zu reduzieren, werden standardmäßig nicht alle Ordner und E-Mails synchronisiert</string>
     <string name="title_hint_airplane">Flugzeugmodus aktiviert</string>
     <string name="title_hint_vpn_active">VPN aktiv</string>
+    <string name="title_hint_vpn_settings">VPN-Liste</string>
     <string name="title_hint_notifications">Keine Benachrichtigungsberechtigungen</string>
     <string name="title_hint_notifications_remark">Benachrichtigungsberechtigungen sind auch für (Konto-)Benachrichtigungen erforderlich. Benachrichtigungen für neue Nachrichten können in den Einstellungen deaktiviert werden.</string>
     <string name="title_hint_battery_optimizations">Akkuoptimierung ist immer noch aktiv</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 65a19a3280..76049e23b3 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -1614,9 +1614,7 @@
     <string name="title_charset_auto">Αυτόματο</string>
     <string name="title_alternative_text">Φόρτωση απλού κειμένου</string>
     <string name="title_alternative_html">Φόρτωση HTML</string>
-    <string name="title_no_openpgp">Δεν βρέθηκε OpenKeychain</string>
     <string name="title_no_openpgp_remark">Η από άκρο σε άκρο κρυπτογράφηση PGP πρέπει πρώτα να ρυθμιστεί</string>
-    <string name="title_user_interaction">Μεταφορά προς OpenKeychain</string>
     <string name="title_padlock">Χρησιμοποιήστε το λουκέτο για να αποκρυπτογραφήσετε το μήνυμα</string>
     <string name="title_signed_data">Επαλήθευση της υπογραφής για προβολή του κειμένου του μηνύματος</string>
     <string name="title_not_encrypted">Το μήνυμα δεν είναι υπογεγραμμένο ή κρυπτογραφημένο</string>
diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml
index 10cc783abc..45c924ed19 100644
--- a/app/src/main/res/values-en-rGB/strings.xml
+++ b/app/src/main/res/values-en-rGB/strings.xml
@@ -101,7 +101,7 @@
     <string name="title_empty_trash_ask">Remove all deleted messages permanently?</string>
     <string name="title_empty_trash_all_ask">Remove all deleted messages of all accounts permanently?</string>
     <string name="title_hint_operations">Deleting operations can result in disappearing messages and synchronisation problems</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Sort on synchronised</string>
+    <string name="title_sort_sync">Sort on synchronised</string>
     <string name="title_edit_account_color">Edit account colour</string>
     <string name="title_synchronize_folder">Synchronise (receive messages)</string>
     <string name="title_poll_folder">Check periodically instead of continuous synchronise</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 482e07df17..de4a72976f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1203,7 +1203,7 @@
     <string name="title_show_flagged">Mostrar cantidad de mensajes destacados</string>
     <string name="title_subscribed_only">Sólo suscritas</string>
     <string name="title_sort_unread_atop">Mostrar no leídos arriba</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Ordenar según sincronización</string>
+    <string name="title_sort_sync">Ordenar según sincronización</string>
     <string name="title_search_folder">Buscar carpeta</string>
     <string name="title_apply_to_all">Aplicar a todos</string>
     <string name="title_edit_account_name">Editar el nombre de la cuenta</string>
@@ -1624,9 +1624,9 @@
     <string name="title_charset_auto">Automático</string>
     <string name="title_alternative_text">Cargar texto plano</string>
     <string name="title_alternative_html">Cargar HTML</string>
-    <string name="title_no_openpgp">OpenKeychain no encontrado</string>
+    <string name="title_no_openpgp">Proveedor OpenPGP no encontrado</string>
     <string name="title_no_openpgp_remark">El cifrado PGP de extremo a extremo debe configurarse primero</string>
-    <string name="title_user_interaction">Transfiriendo a OpenKeychain</string>
+    <string name="title_user_interaction">Transfiriendo al proveedor OpenPGP</string>
     <string name="title_padlock">Use el candado para descifrar el mensaje</string>
     <string name="title_signed_data">Verificar la firma para mostrar el texto del mensaje</string>
     <string name="title_not_encrypted">El mensaje no está firmado ni cifrado</string>
@@ -2008,6 +2008,7 @@
     <string name="title_hint_folder_sync">Para limitar el uso de batería y redes, no todas las carpetas y mensajes serán sincronizados por defecto</string>
     <string name="title_hint_airplane">El modo avión está activado</string>
     <string name="title_hint_vpn_active">VPN activa</string>
+    <string name="title_hint_vpn_settings">Lista de VPN</string>
     <string name="title_hint_notifications">Sin permisos de notificación</string>
     <string name="title_hint_notifications_remark">Los permisos de notificación también son necesarios para las alertas (de cuenta). Las notificaciones de nuevos mensajes pueden desactivarse en la configuración.</string>
     <string name="title_hint_battery_optimizations">Optimizaciones de uso de batería habilitadas</string>
diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml
index 5fa5f30f8c..2de07e2fb9 100644
--- a/app/src/main/res/values-et-rEE/strings.xml
+++ b/app/src/main/res/values-et-rEE/strings.xml
@@ -1632,9 +1632,7 @@ Sa ei pea olema siin, et kontot häälestada. Palun kasuta selleks kiirseadistam
     <string name="title_charset_auto">Automaatne</string>
     <string name="title_alternative_text">Laadi lihttekst</string>
     <string name="title_alternative_html">Laadi HTML</string>
-    <string name="title_no_openpgp">Ei leidnud OpenKeychaini</string>
     <string name="title_no_openpgp_remark">Kõigepealt tuleb häälestada PGP otspunktkrüpteerimine</string>
-    <string name="title_user_interaction">Üle kandmine OpenKeychaini</string>
     <string name="title_padlock">Kasuta sõnumi dekrüpteerimiseks Padlocki</string>
     <string name="title_signed_data">Sõnumi näitamiseks kontrolli allkirja</string>
     <string name="title_not_encrypted">Sõnum pole signeeritud ega krüpteeritud</string>
diff --git a/app/src/main/res/values-eu-rES/strings.xml b/app/src/main/res/values-eu-rES/strings.xml
index 301ac50d5f..d5e8e0393c 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1054,8 +1054,6 @@ Aukerak fitxatan kategorizatuta daude, atalka sakabnatuta, itxura edo erabilerar
     <string name="title_resync">Birsinkronizatu</string>
     <string name="title_charset">Kodeaketa</string>
     <string name="title_charset_auto">Automatikoa</string>
-    <string name="title_no_openpgp">Ez da OpenKeychain aurkitu</string>
-    <string name="title_user_interaction">OpenKeychain-era transferitzen</string>
     <string name="title_signed_data">Egiaztatu sinadura mezuaren testua erakusteko</string>
     <string name="title_not_encrypted">Mezua ez dago ez zifratuta ez sinatuta</string>
     <string name="title_no_sign_key">Sinatzeko gakorik ez da hautatu</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index e2f70cc7cc..9c6ee3e1d2 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -842,7 +842,7 @@
     <string name="title_show_folders">نمایش پوشه‌های پنهان</string>
     <string name="title_show_flagged">نمایش شمار پیام‌های ستاره‌دار</string>
     <string name="title_subscribed_only">تنها مشترک شده</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">مرتب‌سازی بر اساس هماهنگ‌سازی</string>
+    <string name="title_sort_sync">مرتب‌سازی بر اساس هماهنگ‌سازی</string>
     <string name="title_edit_account_color">ویرایش رنگ حساب</string>
     <string name="title_hide_folder">پنهان‌سازی پوشه</string>
     <string name="title_hide_seen_folder">در صورتی که همه پیام‌ها خوانده شده‌اند پوشه را پنهان کن</string>
@@ -1138,8 +1138,8 @@
     <string name="title_resync">همگام‌سازی دوباره</string>
     <string name="title_charset">رمزگذاری</string>
     <string name="title_charset_auto">خودکار</string>
-    <string name="title_no_openpgp">OpenKeychain یافت نشد</string>
-    <string name="title_user_interaction">در حال انتقال به OpenKeychain</string>
+    <string name="title_no_openpgp">ارائه دهنده OpenPGP یافت نشد</string>
+    <string name="title_user_interaction">انتقال به ارائه‌دهنده OpenPGP</string>
     <string name="title_padlock">از قفل برای رمزگشایی پیام استفاده کن</string>
     <string name="title_not_encrypted">پیام امضا یا رمزگذاری نشده است</string>
     <string name="title_no_sign_key">کلید امضائی انتخاب نشده</string>
@@ -1422,6 +1422,7 @@
     <string name="title_hint_folder_sync">برای محدود کردن مصرف دیتا و باتری تمامی پوشه‌ها و پیام‌ها به صورت پیش‌فرض همگام سازی نخواهند شد</string>
     <string name="title_hint_airplane">حالت هواپیما روشن است</string>
     <string name="title_hint_vpn_active">وی‌پی‌ان فعال</string>
+    <string name="title_hint_vpn_settings">لیست وی‌پی‌ان‌ها</string>
     <string name="title_hint_notifications">اجازه اعلان داده نشده</string>
     <string name="title_hint_data_saver">اگر کاهنده مصرف داده فعال باشد، برنامه نمی‌تواند در پس‌زمینه همگام‌سازی شود و ممکن است خطاهای اتصال رخ دهد.</string>
     <string name="title_hint_vpn">خدمات‌دهندگان ایمیل اغلب برقراری ارتباط با وی‌پی‌ان را مسدود می‌کنند. در صورت مواجهه با این مشکل، تنها ارائه‌دهنده ایمیل می‌تواند این مشکل را رفع کند.</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 664c64e9f8..2cd6f3a034 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -1592,9 +1592,7 @@ Tämä voi epäonnistua, minkä takia vanha viesti siirretään roskakoriin talt
     <string name="title_charset_auto">Automaattinen</string>
     <string name="title_alternative_text">Näytä muotoilematon teksti</string>
     <string name="title_alternative_html">Lataa HTML</string>
-    <string name="title_no_openpgp">OpenKeychain ei löytynyt</string>
     <string name="title_no_openpgp_remark">PGP päästä päähän -salaus täytyy määrittää ensin</string>
-    <string name="title_user_interaction">Siirretään OpenKeychain-sovellukseen</string>
     <string name="title_padlock">Pura viestin salaus lukolla</string>
     <string name="title_signed_data">Todenna allekirjoitus näyttääksesi viestin tekstin</string>
     <string name="title_not_encrypted">Viestiä ei ole allekirjoitettu tai salattu</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 0bb6fafbf2..37be620a00 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -1211,7 +1211,7 @@
     <string name="title_show_flagged">Afficher le nombre de messages suivis</string>
     <string name="title_subscribed_only">Abonnés uniquement</string>
     <string name="title_sort_unread_atop">Dossiers avec messages non-lus en haut</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Trier si synchronisé</string>
+    <string name="title_sort_sync">Trier si synchronisé</string>
     <string name="title_search_folder">Rechercher un dossier</string>
     <string name="title_apply_to_all">Appliquer à tous</string>
     <string name="title_edit_account_name">Modifier le nom du compte</string>
@@ -1636,9 +1636,9 @@
     <string name="title_charset_auto">Automatique</string>
     <string name="title_alternative_text">Charger le texte brut</string>
     <string name="title_alternative_html">Charger le HTML</string>
-    <string name="title_no_openpgp">OpenKeychain introuvable</string>
+    <string name="title_no_openpgp">Fournisseur OpenPGP introuvable</string>
     <string name="title_no_openpgp_remark">Le chiffrement PGP de bout en bout doit être configuré en premier</string>
-    <string name="title_user_interaction">Transfert vers OpenKeychain</string>
+    <string name="title_user_interaction">Transfert vers le fournisseur OpenPGP</string>
     <string name="title_padlock">Utiliser le cadenas pour déchiffrer le message</string>
     <string name="title_signed_data">Vérifier la signature pour afficher le texte du message</string>
     <string name="title_not_encrypted">Le message n\'est ni signé ni chiffré</string>
@@ -2022,6 +2022,7 @@
     <string name="title_hint_folder_sync">Afin de limiter l’utilisation de la pile et du réseau, les dossiers et messages ne seront pas tous synchronisés par défaut</string>
     <string name="title_hint_airplane">Le mode avion est activé</string>
     <string name="title_hint_vpn_active">VPN actif</string>
+    <string name="title_hint_vpn_settings">Liste des VPN</string>
     <string name="title_hint_notifications">Aucune autorisation de notification</string>
     <string name="title_hint_notifications_remark">Les autorisations de notification sont également obligatoires pour les alertes (comptes). Les notifications de nouveaux messages peuvent être désactivées dans les paramètres.</string>
     <string name="title_hint_battery_optimizations">Les optimisations de la pile sont toujours activées</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 91e8d15118..9a7c8841c3 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -1211,7 +1211,7 @@
     <string name="title_show_flagged">Afficher le nombre de messages suivis</string>
     <string name="title_subscribed_only">Abonnés uniquement</string>
     <string name="title_sort_unread_atop">Afficher les dossiers contenant des messages non-lus en haut</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Trier si synchronisé</string>
+    <string name="title_sort_sync">Trier si synchronisé</string>
     <string name="title_search_folder">Rechercher un dossier</string>
     <string name="title_apply_to_all">Appliquer à tous</string>
     <string name="title_edit_account_name">Modifier le nom du compte</string>
@@ -1636,9 +1636,9 @@
     <string name="title_charset_auto">Automatique</string>
     <string name="title_alternative_text">Charger le texte brut</string>
     <string name="title_alternative_html">Charger le HTML</string>
-    <string name="title_no_openpgp">OpenKeychain introuvable</string>
+    <string name="title_no_openpgp">Fournisseur OpenPGP introuvable</string>
     <string name="title_no_openpgp_remark">Le chiffrement PGP de bout en bout doit être configuré en premier</string>
-    <string name="title_user_interaction">Transfert vers OpenKeychain</string>
+    <string name="title_user_interaction">Transfert vers le fournisseur OpenPGP</string>
     <string name="title_padlock">Utiliser le cadenas pour déchiffrer le message</string>
     <string name="title_signed_data">Vérifier la signature pour afficher le texte du message</string>
     <string name="title_not_encrypted">Le message n\'est ni signé ni chiffré</string>
@@ -2022,6 +2022,7 @@
     <string name="title_hint_folder_sync">Afin de limiter l’utilisation de la batterie et du réseau, les dossiers et messages ne seront pas tous synchronisés par défaut</string>
     <string name="title_hint_airplane">Le mode avion est activé</string>
     <string name="title_hint_vpn_active">VPN actif</string>
+    <string name="title_hint_vpn_settings">Liste des VPN</string>
     <string name="title_hint_notifications">Aucune autorisation de notification</string>
     <string name="title_hint_notifications_remark">Les autorisations de notification sont également obligatoires pour les alertes (comptes). Les notifications de nouveaux messages peuvent être désactivées dans les paramètres.</string>
     <string name="title_hint_battery_optimizations">Les optimisations de la batterie sont toujours activées</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 39839544d5..5a504a0fca 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -1198,7 +1198,7 @@ Berjochten wurde ophelle sa gau as de e-mailserver se ôfleverje kin en bewarje
     <string name="title_show_flagged">Oantal berjochten mei stjer toane</string>
     <string name="title_subscribed_only">Allinnich abonnearre</string>
     <string name="title_sort_unread_atop">Net-lêzen boppe-oan sortearje</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Op syngronisearre sortearje</string>
+    <string name="title_sort_sync">Op syngronisearre sortearje</string>
     <string name="title_search_folder">Sykje nei map</string>
     <string name="title_apply_to_all">Op alle tapasse</string>
     <string name="title_edit_account_name">Accountnamme bewurkje</string>
@@ -1619,9 +1619,7 @@ Berjochten wurde ophelle sa gau as de e-mailserver se ôfleverje kin en bewarje
     <string name="title_charset_auto">Automatysk</string>
     <string name="title_alternative_text">Platte tekst lade</string>
     <string name="title_alternative_html">HTML lade</string>
-    <string name="title_no_openpgp">OpenKeychain net fûn</string>
     <string name="title_no_openpgp_remark">PGP-end-to-end-fersifering moat earst konfigurearre wurde</string>
-    <string name="title_user_interaction">Oerdrage nei OpenKeychain</string>
     <string name="title_padlock">Brûk it hingslot om it berjocht te ûntsiferjen</string>
     <string name="title_signed_data">Ferifiearje de hantekening om de berjochttekst te toanen</string>
     <string name="title_not_encrypted">Berjocht is net ûndertekene of fersifere</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 6b900be554..ba8f8b5b46 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -1249,8 +1249,6 @@
     <string name="title_resync">Volver sincronizar</string>
     <string name="title_charset">Codificación</string>
     <string name="title_charset_auto">Automático</string>
-    <string name="title_no_openpgp">Non se atopou OpenKeychain</string>
-    <string name="title_user_interaction">Transferindo a OpenKeychain</string>
     <string name="title_padlock">Use o cadeado para descifrar a mensaxe</string>
     <string name="title_signed_data">Verificar a sinatura para mostrar o texto da mensaxe</string>
     <string name="title_not_encrypted">A mensaxe non está asinada nin cifrada</string>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
index 3a7b3740ba..5fe9b4bb20 100644
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ b/app/src/main/res/values-hr-rHR/strings.xml
@@ -1245,8 +1245,6 @@
     <string name="title_resync">Resinkronizacija</string>
     <string name="title_charset">Kodiranje</string>
     <string name="title_charset_auto">Automatski</string>
-    <string name="title_no_openpgp">OpenKeychain nije pronađen</string>
-    <string name="title_user_interaction">Prijenos na OpenKeychain</string>
     <string name="title_signed_data">Provjerite potpis da biste prikazali tekst poruke</string>
     <string name="title_not_encrypted">Poruka nije potpisana ili šifrirana</string>
     <string name="title_no_sign_key">Nije odabran nijedan ključ za potpis</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index ffe59e6508..bdab4a33c8 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -1198,7 +1198,7 @@
     <string name="title_show_flagged">Csillagozott üzenet számláló mutatása</string>
     <string name="title_subscribed_only">Csak feliratkozott</string>
     <string name="title_sort_unread_atop">Olvasatlan előre rendezése</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Rendezés szinkronizálás szerint</string>
+    <string name="title_sort_sync">Rendezés szinkronizálás szerint</string>
     <string name="title_search_folder">Keresés könyvtárra</string>
     <string name="title_apply_to_all">Alkalmazás mindre</string>
     <string name="title_edit_account_name">Fióknév módosítása</string>
@@ -1618,9 +1618,7 @@
     <string name="title_charset_auto">Automatikus</string>
     <string name="title_alternative_text">Egyszerű szöveg betöltése</string>
     <string name="title_alternative_html">HTML betöltése</string>
-    <string name="title_no_openpgp">OpenKeychain nem található</string>
     <string name="title_no_openpgp_remark">A PGP végpontok közti titkosítást először be kell állítani</string>
-    <string name="title_user_interaction">Átvitel az OpenKeychain-re</string>
     <string name="title_padlock">A lakat érintésével titkosítja az üzenetet</string>
     <string name="title_signed_data">Hitelesítse az aláírást az üzenetszöveg megjelenítéséhez</string>
     <string name="title_not_encrypted">Az üzenet nincs aláírva vagy titkosítva</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 6cc836c3e6..c4761f86b9 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -1598,9 +1598,7 @@ Untuk menghapus lampiran, pesan baru harus ditambahkan dan pesan lama harus diha
     <string name="title_charset_auto">Otomatis</string>
     <string name="title_alternative_text">Muat teks biasa</string>
     <string name="title_alternative_html">Muat HTML</string>
-    <string name="title_no_openpgp">OpenKeychain tidak ditemukan</string>
     <string name="title_no_openpgp_remark">Enkripsi end-to-end PGP perlu dikonfigurasi terlebih dahulu</string>
-    <string name="title_user_interaction">Memindahkan ke OpenKeychain</string>
     <string name="title_padlock">Gunakan gembok untuk mendekripsi pesan</string>
     <string name="title_signed_data">Verifikasi tanda tangan untuk menampilkan teks pesan</string>
     <string name="title_not_encrypted">Pesan tidak ditandatangani atau dienkripsi</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 9225415217..a63cd07597 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -1210,7 +1210,7 @@
     <string name="title_show_flagged">Mostra il conteggio dei messaggi con stella</string>
     <string name="title_subscribed_only">Solo sottoscritte</string>
     <string name="title_sort_unread_atop">Metti i messaggi da leggere in cima</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Ordina dopo la sincronizzazione</string>
+    <string name="title_sort_sync">Ordina dopo la sincronizzazione</string>
     <string name="title_search_folder">Cerca per cartella</string>
     <string name="title_apply_to_all">Applica a tutti</string>
     <string name="title_edit_account_name">Modifica il nome dell\'account</string>
@@ -1635,9 +1635,9 @@
     <string name="title_charset_auto">Automatico</string>
     <string name="title_alternative_text">Carica testo semplice</string>
     <string name="title_alternative_html">Carica HTML</string>
-    <string name="title_no_openpgp">OpenKeychain non trovato</string>
+    <string name="title_no_openpgp">Provider OpenPGP non trovato</string>
     <string name="title_no_openpgp_remark">È necessario prima configurare la cifratura end-to-end di PGP</string>
-    <string name="title_user_interaction">Trasferimento a OpenKeychain</string>
+    <string name="title_user_interaction">Trasferimento al provider OpenPGP</string>
     <string name="title_padlock">Usa il lucchetto per decifrare il messaggio</string>
     <string name="title_signed_data">Verifica la firma per mostrare il testo del messaggio</string>
     <string name="title_not_encrypted">Il messaggio non è firmato o crittografato</string>
@@ -2021,6 +2021,7 @@
     <string name="title_hint_folder_sync">Per limitare l\'uso della batteria e della rete, non tutte le cartelle e i messaggi saranno sempre sincronizzati</string>
     <string name="title_hint_airplane">La modalità offline è attivata</string>
     <string name="title_hint_vpn_active">VPN attiva</string>
+    <string name="title_hint_vpn_settings">Elenco VPN</string>
     <string name="title_hint_notifications">Nessun\'autorizzazione di notifica</string>
     <string name="title_hint_notifications_remark">Le autorizzazioni di notifica sono necessarie anche per gli avvisi (dell\'account). Le notifiche per i nuovi messaggi possono essere disattivate nelle impostazioni.</string>
     <string name="title_hint_battery_optimizations">Le ottimizzazioni della batteria sono ancora abilitate</string>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 8716e61d9a..df22e4e9ff 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -1233,7 +1233,7 @@
     <string name="title_show_flagged">הצגת מונה הודעות עם כוכב</string>
     <string name="title_subscribed_only">עם רישום בלבד</string>
     <string name="title_sort_unread_atop">מיון אלו שלא נקראו בהתחלה</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">סידור לפי סנכרון</string>
+    <string name="title_sort_sync">סידור לפי סנכרון</string>
     <string name="title_search_folder">חיפוש אחר תיקייה</string>
     <string name="title_apply_to_all">החלה על הכול</string>
     <string name="title_edit_account_name">עריכת שם חשבון</string>
@@ -1656,9 +1656,9 @@
     <string name="title_charset_auto">אוטומטי</string>
     <string name="title_alternative_text">טעינת טקסט פשוט</string>
     <string name="title_alternative_html">טעינת HTML</string>
-    <string name="title_no_openpgp">OpenKeychain לא נמצא</string>
+    <string name="title_no_openpgp">ספק OpenPGP לא נמצא</string>
     <string name="title_no_openpgp_remark">יש להגדיר הצפנת PGP מקצה לקצה תחילה</string>
-    <string name="title_user_interaction">מועבר ל־OpenKeychain</string>
+    <string name="title_user_interaction">מועבר לספק ה־OpenPGP</string>
     <string name="title_padlock">המנעול משמש לפענוח ההודעה</string>
     <string name="title_signed_data">אימות החתימה כדי להציג את טקסט ההודעה</string>
     <string name="title_not_encrypted">ההודעה אינה חתומה או מוצפנת</string>
@@ -2041,6 +2041,7 @@
     <string name="title_hint_folder_sync">כדי להגביל שימוש בסוללה וברשת לא כל התיקיות ולא כל ההודעות יסונכרנו כברירת מחדל</string>
     <string name="title_hint_airplane">מצב טיסה מופעל</string>
     <string name="title_hint_vpn_active">VPN פעיל</string>
+    <string name="title_hint_vpn_settings">רשימת VPN</string>
     <string name="title_hint_notifications">אין הרשאות להתראות</string>
     <string name="title_hint_notifications_remark">נדרשות הרשאות גם להתראות (חשבון). אפשר לכבות התראות על הודעות חדשות בהגדרות.</string>
     <string name="title_hint_battery_optimizations">מיטובי סוללה עדיין פעילים</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index 19d9ae71df..f84be76c70 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -1612,9 +1612,7 @@
     <string name="title_charset_auto">自動</string>
     <string name="title_alternative_text">プレーンテキストを読み込む</string>
     <string name="title_alternative_html">HTML を読み込む</string>
-    <string name="title_no_openpgp">OpenKeychain が見つかりません</string>
     <string name="title_no_openpgp_remark">PGP エンドツーエンド暗号化は先に設定が必要です</string>
-    <string name="title_user_interaction">OpenKeychain へ転送しています</string>
     <string name="title_padlock">鍵をタップしてメッセージを復号</string>
     <string name="title_signed_data">デジタル署名を検証して本文を表示</string>
     <string name="title_not_encrypted">メッセージはデジタル署名または暗号化されていません</string>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 72064048a0..f88b4a269f 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -1562,9 +1562,7 @@
     <string name="title_charset_auto">자동</string>
     <string name="title_alternative_text">일반 텍스트 불러오기</string>
     <string name="title_alternative_html">HTML 불러오기</string>
-    <string name="title_no_openpgp">OpenKeychain 없음</string>
     <string name="title_no_openpgp_remark">PGP 엔드 투 엔드 암호화를 먼저 설정해야 함</string>
-    <string name="title_user_interaction">OpenKeychain으로 이전</string>
     <string name="title_not_encrypted">메시지가 서명 또는 암호화되지 않았습니다</string>
     <string name="title_no_sign_key">선택된 서명 키 없음</string>
     <string name="title_reset_sign_key">서명 키 초기화</string>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
index f67f05df24..474be15dbe 100644
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ b/app/src/main/res/values-lv-rLV/strings.xml
@@ -608,7 +608,7 @@
     <string name="title_show_folders">Rādīt slēptās mapes</string>
     <string name="title_show_flagged">Rādīt ar zvaigni atzīmēto ziņojumu skaitu</string>
     <string name="title_sort_unread_atop">Kārtot neizlasītos ziņojumus augšā</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Kārtot pēc vienādošanas</string>
+    <string name="title_sort_sync">Kārtot pēc vienādošanas</string>
     <string name="title_search_folder">Meklēt mapi</string>
     <string name="title_apply_to_all">Pielietot visam</string>
     <string name="title_edit_account_name">Labot konta nosaukumu</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index f7e0ca97da..d8704cf0d7 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -946,8 +946,6 @@
     <string name="title_encrypt">Krypter</string>
     <string name="title_decrypt">Dekrypter</string>
     <string name="title_resync">Resync</string>
-    <string name="title_no_openpgp">Finner ikke OpenKeychain</string>
-    <string name="title_user_interaction">Overfører til OpenKeychain</string>
     <string name="title_signed_data">Bekreft signaturen for å vise meldingsteksten</string>
     <string name="title_not_encrypted">Meldingen er ikke signert eller kryptert</string>
     <string name="title_no_sign_key">Ingen signert nøkkel valgt</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 8e9399d6de..6e9fd3be51 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -1196,7 +1196,7 @@ Berichten worden opgehaald zo snel als de mailserver ze kan afleveren en opgesla
     <string name="title_show_flagged">Toon aantal berichten met ster</string>
     <string name="title_subscribed_only">Alleen geabonneerde</string>
     <string name="title_sort_unread_atop">Ongelezen bovenaan sorteren</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Op gesynchroniseerd sorteren</string>
+    <string name="title_sort_sync">Op gesynchroniseerd sorteren</string>
     <string name="title_search_folder">Zoeken naar map</string>
     <string name="title_apply_to_all">Toepassen op alle</string>
     <string name="title_edit_account_name">Bewerk accountnaam</string>
@@ -1615,9 +1615,9 @@ Berichten worden opgehaald zo snel als de mailserver ze kan afleveren en opgesla
     <string name="title_charset_auto">Automatisch</string>
     <string name="title_alternative_text">Laad platte tekst</string>
     <string name="title_alternative_html">Laad HTML</string>
-    <string name="title_no_openpgp">OpenKeychain niet gevonden</string>
+    <string name="title_no_openpgp">OpenPGP-provider niet gevonden</string>
     <string name="title_no_openpgp_remark">PGP end-to-end versleuteling moet eerst worden geconfigureerd</string>
-    <string name="title_user_interaction">Overdragen naar OpenKeychain</string>
+    <string name="title_user_interaction">Overdagen naar OpenPGP-provider</string>
     <string name="title_padlock">Gebruik het hangslot om het bericht te ontsleutelen</string>
     <string name="title_signed_data">Verifieer de handtekening om de berichttekst te tonen</string>
     <string name="title_not_encrypted">Bericht is niet ondertekend of versleuteld</string>
@@ -1997,6 +1997,7 @@ Bij het verzenden van een bericht wordt de afbeelding vanaf de geselecteerde loc
     <string name="title_hint_folder_sync">Om het gebruik van de batterij en het netwerk te beperken, worden niet alle mappen en niet alle berichten standaard gesynchroniseerd</string>
     <string name="title_hint_airplane">Vliegtuigmodus is ingeschakeld</string>
     <string name="title_hint_vpn_active">VPN actief</string>
+    <string name="title_hint_vpn_settings">VPN lijst</string>
     <string name="title_hint_notifications">Geen meldingsrechten</string>
     <string name="title_hint_notifications_remark">Meldingsrechten zijn vereist voor (account) meldingen. Meldingen voor nieuwe berichten kunnen worden uitgeschakeld in de instellingen.</string>
     <string name="title_hint_battery_optimizations">Batterij-optimalisaties nog steeds ingeschakeld</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 8089f45dc3..6f05c8152b 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -937,8 +937,6 @@ Blokkerer en sender er en gratis egenskap.
     <string name="title_encrypt">Krypter</string>
     <string name="title_decrypt">Dekrypter</string>
     <string name="title_resync">Resync</string>
-    <string name="title_no_openpgp">Finner ikke OpenKeychain</string>
-    <string name="title_user_interaction">Overfører til OpenKeychain</string>
     <string name="title_signed_data">Bekreft signaturen for å vise meldingsteksten</string>
     <string name="title_not_encrypted">Meldingen er ikke signert eller kryptert</string>
     <string name="title_no_sign_key">Ingen signert nøkkel valgt</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index ca25a4d3f0..3a0b936c8c 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -937,8 +937,6 @@ Blokkerer en sender er en gratis egenskap.
     <string name="title_encrypt">Krypter</string>
     <string name="title_decrypt">Dekrypter</string>
     <string name="title_resync">Resync</string>
-    <string name="title_no_openpgp">Finner ikke OpenKeychain</string>
-    <string name="title_user_interaction">Overfører til OpenKeychain</string>
     <string name="title_signed_data">Bekreft signaturen for å vise meldingsteksten</string>
     <string name="title_not_encrypted">Meldingen er ikke signert eller kryptert</string>
     <string name="title_no_sign_key">Ingen signert nøkkel valgt</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 89c735c9c4..5b6c20add2 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1230,7 +1230,7 @@ Nie musisz być tutaj, aby skonfigurować konto. W tym celu skorzystaj z przycis
     <string name="title_show_flagged">Pokaż liczbę wiadomości oznaczonych gwiazdką</string>
     <string name="title_subscribed_only">Tylko subskrybowane</string>
     <string name="title_sort_unread_atop">Sortuj nieprzeczytane na górze</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Sortuj według zsynchronizowanych</string>
+    <string name="title_sort_sync">Sortuj według zsynchronizowanych</string>
     <string name="title_search_folder">Szukaj folderu</string>
     <string name="title_apply_to_all">Zastosuj dla wszystkich</string>
     <string name="title_edit_account_name">Edytuj nazwę konta</string>
@@ -1651,9 +1651,9 @@ Jest to bezpieczny, sformatowany widok wiadomości.
     <string name="title_charset_auto">Automatyczne</string>
     <string name="title_alternative_text">Wczytaj zwykły tekst</string>
     <string name="title_alternative_html">Wczytaj HTML</string>
-    <string name="title_no_openpgp">Nie znaleziono OpenKeychain</string>
+    <string name="title_no_openpgp">Nie znaleziono dostawcy OpenPGP</string>
     <string name="title_no_openpgp_remark">Najpierw należy skonfigurować szyfrowanie PGP end-to-end</string>
-    <string name="title_user_interaction">Przenoszenie do OpenKeychain</string>
+    <string name="title_user_interaction">Przenoszenie do dostawcy OpenPGP</string>
     <string name="title_padlock">Użyj kłódki, aby odszyfrować wiadomość</string>
     <string name="title_signed_data">Sprawdź podpis, aby wyświetlić tekst wiadomości</string>
     <string name="title_not_encrypted">Wiadomość nie jest podpisana lub zaszyfrowana</string>
@@ -2037,6 +2037,7 @@ Jest to bezpieczny, sformatowany widok wiadomości.
     <string name="title_hint_folder_sync">W celu ograniczenia użycia baterii i sieci nie wszystkie foldery i wiadomości będą domyślnie synchronizowane</string>
     <string name="title_hint_airplane">Tryb samolotowy jest włączony</string>
     <string name="title_hint_vpn_active">VPN aktywny</string>
+    <string name="title_hint_vpn_settings">Lista VPN</string>
     <string name="title_hint_notifications">Brak uprawnień dla powiadomień</string>
     <string name="title_hint_notifications_remark">Uprawnienia powiadomień są również wymagane dla ostrzeżeń dotyczących konta. Powiadomienia dla nowych wiadomości mogą być wyłączone w ustawieniach.</string>
     <string name="title_hint_battery_optimizations">Optymalizacja baterii jest nadal włączona</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e03eafbac9..9044708e1b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1205,7 +1205,7 @@
     <string name="title_show_flagged">Exibir contagem de mensagens favoritas</string>
     <string name="title_subscribed_only">Somente inscritos</string>
     <string name="title_sort_unread_atop">Ordenar não lidas no topo</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Ordenar em sincronizado</string>
+    <string name="title_sort_sync">Ordenar em sincronizado</string>
     <string name="title_search_folder">Pesquisar pasta</string>
     <string name="title_apply_to_all">Aplicar a todos</string>
     <string name="title_edit_account_name">Editar nome da conta</string>
@@ -1626,9 +1626,9 @@
     <string name="title_charset_auto">Automático</string>
     <string name="title_alternative_text">Carregar texto plano</string>
     <string name="title_alternative_html">Carregar HTML</string>
-    <string name="title_no_openpgp">OpenKeychain não encontrado</string>
+    <string name="title_no_openpgp">Provedor OpenPGP não encontrado</string>
     <string name="title_no_openpgp_remark">A criptografia de ponta a ponta de PGP precisa ser configurada primeiro</string>
-    <string name="title_user_interaction">Transferindo para o OpenKeychain</string>
+    <string name="title_user_interaction">Transferindo para provedor OpenPGP</string>
     <string name="title_padlock">Usar o cadeado para descriptografar a mensagem</string>
     <string name="title_signed_data">Verifique a assinatura para mostrar o texto da mensagem</string>
     <string name="title_not_encrypted">Mensagem não assinada ou criptografada</string>
@@ -2011,6 +2011,7 @@
     <string name="title_hint_folder_sync">Para limitar o uso de bateria e de rede nem todas as pastas e mensagens serão sincronizadas por padrão</string>
     <string name="title_hint_airplane">Modo avião está ativado</string>
     <string name="title_hint_vpn_active">VPN ativa</string>
+    <string name="title_hint_vpn_settings">Lista de VPNs</string>
     <string name="title_hint_notifications">Sem permissões de notificação</string>
     <string name="title_hint_notifications_remark">As permissões de notificação também são necessárias para alerta (de conta). As notificações de novas mensagens podem ser desativadas nas configurações.</string>
     <string name="title_hint_battery_optimizations">Otimizações de bateria continuam ativadas</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 8519461d79..546292f260 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -1205,7 +1205,7 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     <string name="title_show_flagged">Mostrar n⁰ de msg. favoritas</string>
     <string name="title_subscribed_only">Apenas subscritas</string>
     <string name="title_sort_unread_atop">Mostrar pastas por ler primeiro</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Ordenar quando sincronizado</string>
+    <string name="title_sort_sync">Ordenar quando sincronizado</string>
     <string name="title_search_folder">Pesquisar por pasta</string>
     <string name="title_apply_to_all">Aplicar a tudo</string>
     <string name="title_edit_account_name">Editar nome da conta</string>
@@ -1630,9 +1630,9 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     <string name="title_charset_auto">Automático</string>
     <string name="title_alternative_text">Mostrar texto simples</string>
     <string name="title_alternative_html">Mostrar HTML</string>
-    <string name="title_no_openpgp">OpenKeychain não encontrado</string>
+    <string name="title_no_openpgp">Provedor OpenPGP não encontrado</string>
     <string name="title_no_openpgp_remark">A encriptação PGP ponto a ponto precisa ser configurada primeiro</string>
-    <string name="title_user_interaction">A transferir para o OpenKeychain</string>
+    <string name="title_user_interaction">Transferindo para o provedor OpenPGP</string>
     <string name="title_padlock">Use o cadeado para descriptografar a mensagem</string>
     <string name="title_signed_data">Verificar a assinatura para mostrar o texto da mensagem</string>
     <string name="title_not_encrypted">A mensagem não está assinada ou cifrada</string>
@@ -2016,6 +2016,7 @@ Portanto, este problema só pode ser resolvido pelo seu provedor de e-mail - a i
     <string name="title_hint_folder_sync">Para limitar o uso de bateria e rede, por predefinição, nem todas as pastas e mensagens serão sincronizadas</string>
     <string name="title_hint_airplane">O modo de avião está ligado</string>
     <string name="title_hint_vpn_active">VPN ativa</string>
+    <string name="title_hint_vpn_settings">Lista VPN</string>
     <string name="title_hint_notifications">Sem permissão de notificação</string>
     <string name="title_hint_notifications_remark">Permissões de notificação são também necessárias para alertas de (conta). Notificações para novas mensagens podem ser desativadas nas configurações.</string>
     <string name="title_hint_battery_optimizations">Otimizações da bateria continuam ativadas</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 451cd2ed80..aec5b6f36d 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -1634,9 +1634,7 @@
     <string name="title_charset_auto">Automat</string>
     <string name="title_alternative_text">Încărcați text simplu</string>
     <string name="title_alternative_html">Încărcați HTML</string>
-    <string name="title_no_openpgp">OpenKeychain nu a fost găsit</string>
     <string name="title_no_openpgp_remark">Criptarea în ambele părți trebuie să fie configurată mai întâi</string>
-    <string name="title_user_interaction">Transfer la OpenKeychain</string>
     <string name="title_padlock">Folosiți lacătul pentru a decripta mesajul</string>
     <string name="title_signed_data">Verificați semnătura pentru a afișa textul mesajului</string>
     <string name="title_not_encrypted">Mesajul nu este semnat sau criptat</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 415018539b..beff9ef337 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -1232,7 +1232,7 @@
     <string name="title_show_flagged">Показывать количество избранных сообщений</string>
     <string name="title_subscribed_only">Только подписки</string>
     <string name="title_sort_unread_atop">Непрочитанные вверху</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Сортировать по синхронизации</string>
+    <string name="title_sort_sync">Сортировать по синхронизации</string>
     <string name="title_search_folder">Поиск в названии папки</string>
     <string name="title_apply_to_all">Применить ко всем</string>
     <string name="title_edit_account_name">Изменить название учётной записи</string>
@@ -1654,9 +1654,9 @@
     <string name="title_charset_auto">Автовыбор</string>
     <string name="title_alternative_text">Загрузить простой текст</string>
     <string name="title_alternative_html">Загрузить HTML</string>
-    <string name="title_no_openpgp">OpenKeychain не найдено</string>
+    <string name="title_no_openpgp">Провайдер OpenPGP не найден</string>
     <string name="title_no_openpgp_remark">Сначала нужно настроить сквозное шифрование PGP</string>
-    <string name="title_user_interaction">Перенос в OpenKeychain</string>
+    <string name="title_user_interaction">Переход на провайдера OpenPGP</string>
     <string name="title_padlock">Используйте замок для расшифровки сообщения</string>
     <string name="title_signed_data">Проверить подпись, чтобы показать текст сообщения</string>
     <string name="title_not_encrypted">Сообщение не подписано и не зашифровано</string>
@@ -2039,6 +2039,7 @@
     <string name="title_hint_folder_sync">Для экономии заряда батареи и трафика по умолчанию синхронизируются не все папки и сообщения.</string>
     <string name="title_hint_airplane">Режим полета включён</string>
     <string name="title_hint_vpn_active">Включён VPN</string>
+    <string name="title_hint_vpn_settings">Список VPN</string>
     <string name="title_hint_notifications">Отсутствует разрешение на отображение уведомлений</string>
     <string name="title_hint_notifications_remark">Разрешения на уведомления также необходимы для предупреждений (учётной записи). Уведомления о новых сообщениях можно отключить в настройках.</string>
     <string name="title_hint_battery_optimizations">Оптимизация энергопотребления всё ещё включена</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index b5e534f406..2d54a578e3 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -1594,9 +1594,7 @@ Systém Android môže požiadať o povolenie prístupu k vybranému priečinku,
     <string name="title_charset_auto">Automatické</string>
     <string name="title_alternative_text">Načítať obyčajný text</string>
     <string name="title_alternative_html">Načítať HTML</string>
-    <string name="title_no_openpgp">OpenKeychain nenájdený</string>
     <string name="title_no_openpgp_remark">Najprv je potrebné nastaviť end-to-end šifrovanie PGP</string>
-    <string name="title_user_interaction">Prenos do OpenKeychain</string>
     <string name="title_padlock">Na dešifrovanie správy použiť zámok</string>
     <string name="title_signed_data">Overiť podpis pre zobrazenie textu správy</string>
     <string name="title_not_encrypted">Správa nie je podpísaná alebo šifrovaná</string>
diff --git a/app/src/main/res/values-sl-rSI/strings.xml b/app/src/main/res/values-sl-rSI/strings.xml
index 77d1e6be29..a775b4076c 100644
--- a/app/src/main/res/values-sl-rSI/strings.xml
+++ b/app/src/main/res/values-sl-rSI/strings.xml
@@ -1379,9 +1379,7 @@
     <string name="title_charset_auto">Samodejno</string>
     <string name="title_alternative_text">Naloži golo besedilo</string>
     <string name="title_alternative_html">Naloži HTML</string>
-    <string name="title_no_openpgp">OpenKeychain ni bil najden.</string>
     <string name="title_no_openpgp_remark">Najprej je treba nastaviti šifriranje PGP</string>
-    <string name="title_user_interaction">Prenašanje v OpenKeychain</string>
     <string name="title_padlock">Uporabi ključavnico za odšifriranje besedila</string>
     <string name="title_signed_data">Preveri podpis za prikaz besedila sporočila.</string>
     <string name="title_not_encrypted">Sporočilo ni podpisano ali šifrirano.</string>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
index 358f345039..bc0919d2e4 100644
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ b/app/src/main/res/values-sr-rSP/strings.xml
@@ -625,7 +625,6 @@
     <string name="title_encrypt">Шифруј</string>
     <string name="title_decrypt">Дешифруј</string>
     <string name="title_resync">Ресинхронизуј</string>
-    <string name="title_no_openpgp">OpenKeychain није нађен</string>
     <string name="title_not_encrypted">Порука није ни потписана ни шифрована</string>
     <string name="title_reset_sign_key">Ресетуј кључ за потпис</string>
     <string name="title_signature_none">Порука није потписана</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 18ce206d26..230df4512c 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -1581,9 +1581,7 @@
     <string name="title_charset_auto">Automatiskt</string>
     <string name="title_alternative_text">Visa oformaterad text</string>
     <string name="title_alternative_html">Visa HTML</string>
-    <string name="title_no_openpgp">OpenKeychain hittades inte</string>
     <string name="title_no_openpgp_remark">PGP obruten (end-to-end) kryptering måste konfigureras först</string>
-    <string name="title_user_interaction">Överför till OpenKeychain</string>
     <string name="title_padlock">Använd hänglåset för att dekryptera meddelandet</string>
     <string name="title_signed_data">Verifiera signaturen för att visa meddelandetexten</string>
     <string name="title_not_encrypted">Meddelandet är inte signerat eller krypterat</string>
diff --git a/app/src/main/res/values-szl-rPL/strings.xml b/app/src/main/res/values-szl-rPL/strings.xml
index 89c735c9c4..5b6c20add2 100644
--- a/app/src/main/res/values-szl-rPL/strings.xml
+++ b/app/src/main/res/values-szl-rPL/strings.xml
@@ -1230,7 +1230,7 @@ Nie musisz być tutaj, aby skonfigurować konto. W tym celu skorzystaj z przycis
     <string name="title_show_flagged">Pokaż liczbę wiadomości oznaczonych gwiazdką</string>
     <string name="title_subscribed_only">Tylko subskrybowane</string>
     <string name="title_sort_unread_atop">Sortuj nieprzeczytane na górze</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">Sortuj według zsynchronizowanych</string>
+    <string name="title_sort_sync">Sortuj według zsynchronizowanych</string>
     <string name="title_search_folder">Szukaj folderu</string>
     <string name="title_apply_to_all">Zastosuj dla wszystkich</string>
     <string name="title_edit_account_name">Edytuj nazwę konta</string>
@@ -1651,9 +1651,9 @@ Jest to bezpieczny, sformatowany widok wiadomości.
     <string name="title_charset_auto">Automatyczne</string>
     <string name="title_alternative_text">Wczytaj zwykły tekst</string>
     <string name="title_alternative_html">Wczytaj HTML</string>
-    <string name="title_no_openpgp">Nie znaleziono OpenKeychain</string>
+    <string name="title_no_openpgp">Nie znaleziono dostawcy OpenPGP</string>
     <string name="title_no_openpgp_remark">Najpierw należy skonfigurować szyfrowanie PGP end-to-end</string>
-    <string name="title_user_interaction">Przenoszenie do OpenKeychain</string>
+    <string name="title_user_interaction">Przenoszenie do dostawcy OpenPGP</string>
     <string name="title_padlock">Użyj kłódki, aby odszyfrować wiadomość</string>
     <string name="title_signed_data">Sprawdź podpis, aby wyświetlić tekst wiadomości</string>
     <string name="title_not_encrypted">Wiadomość nie jest podpisana lub zaszyfrowana</string>
@@ -2037,6 +2037,7 @@ Jest to bezpieczny, sformatowany widok wiadomości.
     <string name="title_hint_folder_sync">W celu ograniczenia użycia baterii i sieci nie wszystkie foldery i wiadomości będą domyślnie synchronizowane</string>
     <string name="title_hint_airplane">Tryb samolotowy jest włączony</string>
     <string name="title_hint_vpn_active">VPN aktywny</string>
+    <string name="title_hint_vpn_settings">Lista VPN</string>
     <string name="title_hint_notifications">Brak uprawnień dla powiadomień</string>
     <string name="title_hint_notifications_remark">Uprawnienia powiadomień są również wymagane dla ostrzeżeń dotyczących konta. Powiadomienia dla nowych wiadomości mogą być wyłączone w ustawieniach.</string>
     <string name="title_hint_battery_optimizations">Optymalizacja baterii jest nadal włączona</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 1afc1e6df5..7053c99b87 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -1639,9 +1639,7 @@ Dosya: strings. xml</string>
     <string name="title_charset_auto">Otomatik</string>
     <string name="title_alternative_text">Düzen metni yükle</string>
     <string name="title_alternative_html">HTML\'i yükle</string>
-    <string name="title_no_openpgp">OpenKeychain bulunamadı</string>
     <string name="title_no_openpgp_remark">Önce PGP uçtan uca şifrelemenin yapılandırılması gerekir</string>
-    <string name="title_user_interaction">OpenKeychain\'e gönderiliyor</string>
     <string name="title_padlock">Mesajın şifresini çözmek için asma kilidi kullan</string>
     <string name="title_signed_data">Mesaj metnini göstermek için imzayı doğrula</string>
     <string name="title_not_encrypted">Mesaj imzalı veya şifreli değil</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index 567acc3ad1..6dcf8d0e58 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -1234,7 +1234,7 @@
     <string name="title_show_flagged">Показувати кількість обраних повідомлень</string>
     <string name="title_subscribed_only">Тільки підписки</string>
     <string name="title_sort_unread_atop">Сортувати, непрочитані зверху</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">За останньою синхронізацією</string>
+    <string name="title_sort_sync">За останньою синхронізацією</string>
     <string name="title_search_folder">Шукати теку</string>
     <string name="title_apply_to_all">Застосувати до всіх</string>
     <string name="title_edit_account_name">Редагувати назву облікового запису</string>
@@ -1657,9 +1657,9 @@
     <string name="title_charset_auto">Автоматичне</string>
     <string name="title_alternative_text">Завантажити простий текст</string>
     <string name="title_alternative_html">Завантажити HTML</string>
-    <string name="title_no_openpgp">OpenKeychain не знайдено</string>
+    <string name="title_no_openpgp">Провайдера OpenPGP не знайдено</string>
     <string name="title_no_openpgp_remark">Для використання шифрування PGP end-to-end потрібно спершу його налаштувати</string>
-    <string name="title_user_interaction">Передача в OpenKeychain</string>
+    <string name="title_user_interaction">Передача до провайдера OpenPGP</string>
     <string name="title_padlock">Натисніть на замок для розшифровки повідомлення</string>
     <string name="title_signed_data">Перевірте підпис, щоб показати текст повідомлення</string>
     <string name="title_not_encrypted">Повідомлення не підписано або не зашифровано</string>
@@ -2043,6 +2043,7 @@
     <string name="title_hint_folder_sync">Щоб обмежити використання батареї та мережі не всі теки й не всі повідомлення буде синхронізовано за замовчуванням</string>
     <string name="title_hint_airplane">Режим «у літаку» ввімкнено</string>
     <string name="title_hint_vpn_active">VPN є активним</string>
+    <string name="title_hint_vpn_settings">Список VPN</string>
     <string name="title_hint_notifications">Немає дозволів для сповіщень</string>
     <string name="title_hint_notifications_remark">Дозволи на показ сповіщень також необхідні для попереджень (зокрема щодо облікових записів). Сповіщення про нові повідомлення можна вимкнути в налаштуваннях.</string>
     <string name="title_hint_battery_optimizations">Оптимізація батареї все ще увімкнена</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index bd58f50c92..60daf00d8b 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -1253,8 +1253,6 @@
     <string name="title_resync">Đồng bộ lại</string>
     <string name="title_charset">Bảng mã</string>
     <string name="title_charset_auto">Tự động</string>
-    <string name="title_no_openpgp">Không tìm thấy OpenKeychain</string>
-    <string name="title_user_interaction">Đang chuyển sang OpenKeychain</string>
     <string name="title_padlock">Sử dụng khoá để giải mã thư</string>
     <string name="title_signed_data">Xác minh chữ ký để hiện văn bản thư</string>
     <string name="title_not_encrypted">Thư không được ký hoặc mã hóa</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 999417fd7e..945a6f0c65 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1195,7 +1195,7 @@
     <string name="title_show_flagged">显示星标邮件数</string>
     <string name="title_subscribed_only">隐藏未订阅</string>
     <string name="title_sort_unread_atop">未读居前</string>
-    <string name="title_sort_sync" comment="title_sort_sync Title for menu item in the overflow menu of the folder list to enable/disable sorting folders on whether they are synchronized or not. Please keep it short!">排列已同步文件夹</string>
+    <string name="title_sort_sync">排列已同步文件夹</string>
     <string name="title_search_folder">搜索文件夹</string>
     <string name="title_apply_to_all">应用到全部</string>
     <string name="title_edit_account_name">编辑账户名称</string>
@@ -1615,9 +1615,9 @@
     <string name="title_charset_auto">自动</string>
     <string name="title_alternative_text">加载纯文本</string>
     <string name="title_alternative_html">加载 HTML</string>
-    <string name="title_no_openpgp">OpenKeychain 未找到</string>
+    <string name="title_no_openpgp">未找到 OpenPGP 提供商</string>
     <string name="title_no_openpgp_remark">PGP 端到端加密需要先进行配置</string>
-    <string name="title_user_interaction">正传输到 OpenKeychain</string>
+    <string name="title_user_interaction">正在传输到 OpenPGP 提供商</string>
     <string name="title_padlock">使用挂锁解密邮件</string>
     <string name="title_signed_data">验证签名以显示邮件文本</string>
     <string name="title_not_encrypted">邮件未签名或加密</string>
@@ -2000,6 +2000,7 @@
     <string name="title_hint_folder_sync">为了降低电量和网络流量的消耗，默认不会同步全部的文件夹和邮件</string>
     <string name="title_hint_airplane">飞行模式已开启</string>
     <string name="title_hint_vpn_active">VPN 处于活跃状态</string>
+    <string name="title_hint_vpn_settings">VPN 列表</string>
     <string name="title_hint_notifications">无通知权限</string>
     <string name="title_hint_notifications_remark">(账户) 提醒也需要通知权限。新邮件的通知可以在设置中关闭。</string>
     <string name="title_hint_battery_optimizations">电池优化仍已启用</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7a0382f80a..ed654a25c1 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1592,9 +1592,7 @@ Android 可能會要求訪問所選資料夾的權限，儘管應用程式並不
     <string name="title_charset_auto">自動</string>
     <string name="title_alternative_text">載入純文字</string>
     <string name="title_alternative_html">載入 HTML</string>
-    <string name="title_no_openpgp">未發現 OpenKeychain</string>
     <string name="title_no_openpgp_remark">PGP 端到端加密需要先進行設定</string>
-    <string name="title_user_interaction">正在轉移至 OpenKeychain</string>
     <string name="title_padlock">使用鎖頭圖示來解密訊息</string>
     <string name="title_signed_data">驗證簽名以顯示訊息文字</string>
     <string name="title_not_encrypted">訊息未簽名或未加密</string>