diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 73ebfd20a..bc1c2a122 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Haal tans rekeninginligting op…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Valideer tans bedienerinstellings..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Valideer tans SMTP-instellings..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Rekening-opstelling"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Jou rekening is opgestel en die e-pos is op pad!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gee hierdie rekening \'n naam (opsioneel)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Agtergrond-sinkronisasie vir hierdie rekening is gedeaktiveer tydens swerwing."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Stuur tans antwoord..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Geen boodskappe nie."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Druk IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Kieskeurig, kieskeurig, kieskeurig!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Kies bediener se rommelvouer"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Kies bediener se gestuurde-itemsvouer"</string>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 268da6029..7d4c6bf18 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"የመለያ መረጃ ሰርስሮ በማውጣት ላይ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"የአገልጋይ ቅንብሮችን በማረጋገጥ ላይ…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"የsmtp ቅንብሮችን በማረጋገጥ ላይ…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"መለያ አዘጋጅ"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"መለያህ ተዋቅሯል፣ ኢሜይልህም መንገድ ላይ ነው!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ለዚሀመለያ ስም ስጥ(አማራጭ)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"ውጫዊ አገልግሎት በማድረግ ጊዜ የዳራ ማመሳሰል ለእዚህ መለያ ቦዝኗል፡፡"</string>
     <string name="confirm_response" msgid="9151965975158906286">"ምላሽ በመላክ ላይ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"መልዕክቶች የሉም።"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAPን ገ"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"ጥንቃቄ፣ ጥንቃቄ፣ ጥንቃቄ!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"የአገልጋይ ቆሻሻ መጣያ አቃፊን ይምረጡ"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"የአገልጋይ የተላኩ ንጥሎች አቃፊን ይምረጡ"</string>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 2b92b3151..2472c3151 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"جارٍ استرداد معلومات الحساب…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"جارٍ التحقق من إعدادات الخادم…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"جارٍ التحقق من إعدادات smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"إعداد الحساب"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"تمّ إعداد حسابك، وستصلك رسالة إلكترونية بعد قليل."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"تسمية هذا الحساب (اختياري)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"تم تعطيل المزامنة في الخلفية لهذا الحساب أثناء التجوال."</string>
     <string name="confirm_response" msgid="9151965975158906286">"جارٍ إرسال الرد..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"ليست هناك أية رسائل."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"توجيه الوصول عبر IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"أنيق، أنيق، أنيق!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"حدد مجلد المهملات في الخادم"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"حدد مجلد العناصر المرسلة في الخادم"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 0caa3ce85..f712a7760 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Атрыманне інфармацыі аб уліковым запісе..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Праверка налад сервера..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Праверка налад пратакола SMTP..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Усталяванне ўліковага запісу"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Уліковы запіс створаны, электронная пошта адпраўляецца."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Дайце гэтаму ўліковаму запісу назву (не абавязкова)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Фонавая сінхранізацыя для гэтага ўліковага запісу адключана ў роўмінгу."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Адпраўка адказу..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Паведамленняў няма."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Націсніце IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Так-так-так!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Выберыце тэчку для смецця на серверы"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Выберыце тэчку \"Тавары, адпраўленыя з сервера\""</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 14b799c62..98272ea13 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Извлича се информация за профила..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Настройките на сървъра се потвърждават…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Настройките за SMTP се потвърждават…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка на профила"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Профилът ви е настроен и имейлите са на път!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именуване на този профил (незадължително)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизирането на заден план за този профил е деактивирано при роуминг."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Отговорът се изпраща…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Няма съобщения."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Избор на папка „Кошче“ за сървъра"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Избор на папка за изпратени до сървъра елементи"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9fb930c5c..436d67ccc 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"S\'està recuperant la informació del compte..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"S\'està validant la configuració del servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"S\'està validant la configuració de smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuració del compte"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"El compte s\'ha configurat i aviat rebràs un correu electrònic."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assigneu un nom al compte (opcional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"La sincronització de fons per a aquest compte està desactivada en itinerància."</string>
     <string name="confirm_response" msgid="9151965975158906286">"S\'està enviant la resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hi ha missatges."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP d\'inserció"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Ben delicat!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Sel. carp. paperera servidor"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sel. carp. elem. env. pel ser."</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 34e8b797a..eced16c5c 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítání informací o účtu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Ověřování nastavení serveru…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Ověřování nastavení serveru SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavení účtu"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastaven, e-mail je na cestě!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pojmenovat tento účet (nepovinné)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizace na pozadí je v tomto účtu při roamingu zakázána."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Odesílání odpovědi..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žádné zprávy."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Kdo vybírá, přebere."</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Vyberte na serveru složku koše"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Vyberte složku odesl. položek"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 0ac438e75..5484f89e1 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontooplysninger ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Godkender serverindstillinger..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Godkender SMTP-indstillinger..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoindstillinger"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Din konto er konfigureret, og der er e-mail på vej."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Giv kontoen et navn (valgfrit)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Baggrundssynkronisering for denne konto deaktiveres under roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Sender svar..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ingen meddelelser."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Kræsen, kræsen, kræsen!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Vælg serverens papirkurv"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Vælg serverens sendte emner"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 853287098..971394957 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kontoinformationen werden abgerufen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Servereinstellungen werden überprüft…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP-Einstellungen werden überprüft…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoeinrichtung"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Das Konto ist jetzt eingerichtet und die E-Mail ist unterwegs."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Konto benennen (optional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Die Hintergrundsynchronisierung ist für dieses Konto während des Roamings deaktiviert."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Antwort wird gesendet…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Keine Nachrichten"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push-IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Ordner auswählen"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Papierkorb des Servers wählen"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Ordner \"Gesendete Elemente\" des Servers wählen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index ab5abf804..9cf12fea0 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ανάκτηση στοιχείων λογαριασμού..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Επαλήθευση ρυθμίσεων διακομιστή…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Επαλήθευση ρυθμίσεων smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Ρύθμιση λογαριασμού"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Ο λογαριασμός σας ρυθμίστηκε και γίνεται λήψη μηνυμάτων ηλεκτρονικού ταχυδρομείου!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Δώστε σε αυτόν τον λογαριασμό ένα όνομα (προαιρετικό)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ο συγχρονισμός στο παρασκήνιο για αυτόν το λογαριασμό είναι απενεργοποιημένος κατά την περιαγωγή."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Αποστολή απάντησης..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Δεν υπάρχουν μηνύματα."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Προώθηση IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Επιλεκτικό, επιλεκτικό, επιλεκτικό!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Επιλ.φάκ. απορριμ.διακομ."</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Επιλ. φάκελο απεστ. διακομ."</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index fb2a6bb1e..472c1c5be 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Retrieving account information…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validating server settings…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validating smtp settings…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Account setup"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Your account is set up and emails are on their way!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Give this account a name (optional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Background sync for this account is disabled while roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Sending response…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No messages."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Select server trash folder"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Select server sent items folder"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 569dc2485..9c76b4b47 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validando configuración del servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validando configuración de SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de la cuenta"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Se ha configurado tu cuenta y el correo está en camino."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nombre a esta cuenta (opcional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Enviando respuesta…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hay mensajes."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Muy exigente"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Carpeta de papelera"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Carpeta elementos enviados"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index d8a5b080a..ad852114d 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando la información de la cuenta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validando ajustes del servidor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validando ajustes de SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuración de cuenta"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Tu cuenta ya está configurada y en breve verás tu correo."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Asigna un nombre a esta cuenta (opcional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Se ha inhabilitado la sincronización en segundo plano de esta cuenta en itinerancia."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Enviando respuesta…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"No hay ningún mensaje."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Muy exigente"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Carpeta de papelera"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Carpeta elementos enviados"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 0bb084ebe..98a7f8908 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Kontoteabe saamine ..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Serveri seadete kontrollimine ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP seadete kontrollimine …"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konto seadistamine"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Teie konto on seadistatud ja meilid on tulekul."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna sellele kontole nimi (valikuline)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Taustsünkroonimine on sellel kontol rändluse ajal keelatud."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Vastuse saatmine ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Sõnumeid pole."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Tõuke-IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Valiv, valiv, valiv!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Valige serv. prügikasti kaust"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Valige serv. saad. üks. kaust"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e76c885e9..013f1b8cc 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"در حال بازیابی اطلاعات حساب..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"درحال تأیید اعتبار تنظیمات سرور..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"درحال تأیید اعتبار تنظیمات smtp..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"تنظیم حساب"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"حساب شما تنظیم شد و ایمیل در راه است!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"نامی به این حساب اختصاص دهید (اختیاری)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"هنگام رومینگ، همگام‌سازی پس‌زمینه برای این حساب غیرفعال است."</string>
     <string name="confirm_response" msgid="9151965975158906286">"در حال ارسال پاسخ…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"پیامی موجود نیست."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"ارسال IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"مشکل پسند، مشکل پسند، مشکل پسند!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"انتخاب پوشه حذف‌شده‌های سرور"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"انتخاب پوشه موارد ارسال شده سرور"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index acea9ed92..c6f0208ff 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Noudetaan tilin tietoja…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Vahvistetaan palvelimen asetuksia..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Vahvistetaan SMTP-asetuksia..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Tilin asetukset"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Tili on määritetty ja sähköposteja noudetaan."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Anna tilille nimi (valinnainen)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Tämän tilin taustasynkronointi on pois käytöstä roaming-tilassa."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Vastausta lähetetään..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ei viestejä."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push-IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Nirso!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Valitse palvelimen roskakori"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Valitse palv. läh. koht. -kans"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index e85b7c496..e9b35e9ec 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Récupération des informations sur le compte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validation des paramètres du serveur en cours…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validation des paramètres SMTP en cours…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuration du compte"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Votre compte est configuré et votre messagerie est activée !"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nom du compte (facultatif)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"La synchronisation en arrière-plan pour ce compte est désactivée en itinérance."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Envoi de la réponse en cours…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Aucun message"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP par système Push"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Sélection de dossier"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Sélectionnez le dossier \"Corbeille\" du serveur."</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sélectionnez le dossier des éléments envoyés du serveur."</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 69475c9e4..93727549b 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"खाता जानकारी पुनर्प्राप्त कर रहा है…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"सर्वर सेटिंग सत्यापित की जा रही हैं…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp सेटिंग सत्यापित की जा रही हैं…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"खाता सेटअप"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"आपका खाता सेट हो गया है और शीघ्र ही ईमेल मिलने वाला है!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"इस खाते को कोई नाम दें (वैकल्पिक)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"रोमिंग के दौरान इस खाते के लिए पृष्ठभूमि समन्‍वयन अक्षम है."</string>
     <string name="confirm_response" msgid="9151965975158906286">"प्रतिक्रिया भेज रहा है..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"कोई संदेश नहीं."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"पुश IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"चुनें, चुनें, चुनें!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"सर्वर के ट्रैश फ़ोल्डर को चुनें"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"सर्वर के भेजे गए आइटम फ़ोल्डर को चुनें"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 588bd3543..36e4c3568 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Učitavanje podataka o računu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Provjeravanje postavki poslužitelja…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Provjeravanje postavki SMPT-a…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Postavljanje računa"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Vaš je račun postavljen, a e-pošta stiže!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dodijelite ovom računu naziv (opcionalno)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Pozadinska sinkronizacija za ovaj račun onemogućena je u roamingu."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Slanje odgovora..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nema poruka."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Birajte, birajte, birajte!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Odaberite mapu za otpad poslužitelja"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Odaberite mapu za poslane stavke poslužitelja"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 087962529..5e462572c 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Fiókadatok beolvasása..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Szerverbeállítások ellenőrzése..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP-beállítások ellenőrzése..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Fiók beállítása"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"A fiók beállítása befejeződött, az e-mailek úton vannak."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Fiók elnevezése (opcionális)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A fiók háttérben zajló szinkronizálása le van tiltva barangolás közben."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Válasz küldése..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nincsenek üzenetek."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Nyomja meg az IMAP-et"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Válogatós, válogatós, válogatós!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Válassza ki a szerver lomtárát"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Válassza ki a szerver küldött elemek mappáját"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 5c1696f31..5ffb6a6de 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Mengambil informasi akun..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Memvalidasi setelan server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Memvalidasi setelan smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Penyiapan akun"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Akun Anda sudah siap dan email akan segera tiba!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Beri nama akun ini (opsional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinkronisasi latar belakang untuk akun ini dinonaktifkan saat roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Mengirim tanggapan..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Tidak ada pesan."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP push"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Pilih, pilih, pilih!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Pilih folder sampah server"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Pilih folder item terkirim"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index b339eb31e..523954dbe 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recupero informazioni sull\'account…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Convalida impostazioni del server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Convalida delle impostazioni SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Impostazione account"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Il tuo account è stato impostato e l\'email sarà presto disponibile."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Assegna un nome all\'account (facoltativo)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizzazione dello sfondo per questo account disattivata durante il roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Invio risposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nessun messaggio."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Seleziona cartella Cestino"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Seleziona Posta inviata"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 90d532274..8cfa20e92 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"מאחזר פרטי חשבון..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"מאמת הגדרות שרת…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"מאמת הגדרות smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"הגדרת חשבון"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"החשבון שלך הוגדר והדוא\"ל בדרך!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"תן שם לחשבון זה (אופציונלי)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"סינכרון ברקע של חשבון זה מושבת בזמן נדידה."</string>
     <string name="confirm_response" msgid="9151965975158906286">"שולח תגובה…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"אין הודעות."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"בררן, בררן, בררן!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"בחר בתיקיית השרת \'אשפה\'"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"בחר בתיקיית השרת \'פריטים שנשלחו\'"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ff6920f1f..f4bb6c2d9 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"アカウント情報を取得中..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"サーバー設定を確認しています…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp設定を確認しています…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"アカウント設定"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"アカウントの設定が完了しました。"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"このアカウントに名前を付ける (省略可):"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"このアカウントのバックグラウンドでの同期は、ローミング中は無効です。"</string>
     <string name="confirm_response" msgid="9151965975158906286">"出欠状況を送信しています…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"メッセージはありません。"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAPをプッシュ"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"フォルダを選択"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"サーバーのゴミ箱フォルダを選択"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"サーバーの送信済みフォルダを選択"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index e143184ae..975dff233 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"계정 정보 검색 중..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"서버 설정 확인 중…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"smtp 설정 확인 중…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"계정 설정"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"계정이 설정되었으며 이메일을 사용할 수 있습니다."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"계정 이름 지정(선택사항)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"계정 백그라운드 동기화가 로밍하는 동안 사용 중지됩니다."</string>
     <string name="confirm_response" msgid="9151965975158906286">"응답을 보내는 중..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"메시지가 없습니다."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP 푸시"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"서버의 휴지통 폴더 선택"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"서버의 전송한 항목 폴더 선택"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 590fa3498..27cf0db26 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Nuskaitoma paskyros informacija..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Tikrinami serverio nustatymai…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Tikrinami SMTP nustatymai…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Paskyros sąranka"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Paskyra nustatyta, el. laiškas išsiųstas!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Suteikti šiai paskyrai pavadinimą (pasirenkama)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Foninis šios paskyros sinchronizavimas neleidžiamas perduodant duomenis tarptinkliniu ryšiu."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Siunčiamas atsakymas…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Pranešimų nėra."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Įkyru!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Pasir. serverio šiukšl. apl."</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Pasir. serv. išs. elem. apl."</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 6ef84bcf9..29a9a3ba7 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Notiek konta informācijas izgūšana..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Notiek servera iestatījumu pārbaude…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Notiek SMTP iestatījumu pārbaude..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konta iestatīšana"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Jūsu konts ir izveidots, un ir nosūtīts e-pasta ziņojums."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ievadiet konta nosaukumu (neobligāti)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Viesabonēšanas laikā fona sinhronizācija šajā kontā ir atspējota."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Notiek atbildes sūtīšana..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nav ziņojumu."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Izvēlieties!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Atlasiet servera mapi Miskaste"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Atl. serv. mapi Nosūt. vien."</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 66a20787e..f663f394c 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Mendapatkan semula maklumat akaun..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Mengesahkan tetapan pelayan…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Mengesahkan tetapan smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Persediaan akaun"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Akaun anda sudah disediakan dan e-mel akan muncul sebentar lagi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Namakan akaun ini (pilihan)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Segerakkan latar belakang untuk akaun ini dilumpuhkan semasa perayauan."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Menghantar jawapan…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Tiada mesej."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP Tolak"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Cerewet betul!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Pilih folder sampah pelayan"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Pilih folder item dihantar pelayan"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f36a0e6bb..cc094eacb 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Henter kontoinformasjon…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Bekrefter tjenerinnstillingene ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Bekrefter smtp-innstillingene ..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfigurering av konto"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Kontoen din er konfigurert, og e-post er på vei."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Gi denne kontoen et navn (valgfritt)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrunnssynkronisering for denne kontoen er deaktivert under streifing."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Sender svaret ditt ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ingen e-poster."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP for Push"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Velg tjenerens papirkurv"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Velg tjenerens mappe for sendte elementer"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 560b208e0..a5de624db 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Accountinformatie ophalen..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Serverinstellingen verifiëren…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP-instellingen verifiëren…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Accountinstellingen"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Uw account is ingesteld en er is e-mail onderweg."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Geef dit account een naam (optioneel)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Achtergrondsynchronisatie voor dit account is uitgeschakeld tijdens roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Reactie verzenden…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Geen berichten."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP pushen"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Eerste keus!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Selecteer serverprullenbak"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Selecteer servermap \'Verzonden\'"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index f1a2d77f6..91b9d512d 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pobieranie informacji o koncie…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Sprawdzam ustawienia serwera…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Sprawdzam ustawienia SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Konfiguracja konta"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Konto zostało skonfigurowane, a e-maile są w drodze."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nazwa konta (opcjonalnie)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizacja w tle z tym kontem jest podczas roamingu wyłączona."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Wysyłam odpowiedź…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Brak wiadomości."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Wybredny, wybredny, wybredny!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Wybierz folder kosza na serwerze"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Wybierz folder elementów wysłanych na serwerze"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index b0647f8b3..7aafefe81 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"A obter informações da conta..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"A validar as definições do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"A validar as configurações de smtp..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"A sua conta está configurada e o e-mail vai a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar um nome a esta conta (opcional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano desta conta está desativada quando está em roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"A enviar resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Não tem mensagens."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Exigente, exigente, exigente!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Selec. pasta lixo do servidor"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sel. pasta itens env. servidor"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 68c064643..3bece51ad 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Recuperando informações sobre a conta"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validando as configurações do servidor..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validando as configurações de SMTP..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configuração da conta"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Sua conta está configurada e o e-mail está a caminho!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Dar nome a esta conta (opcional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"A sincronização em segundo plano para essa conta é desativada durante o roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Enviando resposta..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Nenhuma mensagem."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Super exigente!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Selec. pasta de lixo do serv."</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sel. pasta enviados do serv."</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 58257a04c..d9d3ff1fe 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -341,6 +341,8 @@
     <skip />
     <!-- no translation found for account_setup_check_settings_check_outgoing_msg (4566131393776891419) -->
     <skip />
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <!-- no translation found for account_setup_names_title (8483517350241119291) -->
     <skip />
     <!-- no translation found for account_setup_names_headline (914858472109729140) -->
@@ -761,7 +763,9 @@
     <skip />
     <!-- no translation found for no_conversations (5559527390337162819) -->
     <skip />
-    <!-- no translation found for imap2_name (2742745881421883233) -->
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
     <skip />
     <!-- no translation found for folder_picker_title (5213735893918108637) -->
     <skip />
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index db64da304..d079d33b9 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Se preiau informaţiile despre cont..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Se validează setările serverului..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Se validează setările SMTP..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Configurare cont"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Contul este configurat, iar e-mailul funcţionează corect!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Daţi un nume acestui cont (opţional)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sincronizarea în fundal pentru acest cont este dezactivată în roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Se trimite răspunsul…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Niciun mesaj."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP de tip push"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Alegeți coș gunoi server"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Alegeți mesaje trimise server"</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e461b7502..6f09fbab1 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Получение информации аккаунта..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Проверка настроек сервера…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Проверка настроек SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Настройка аккаунта"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Аккаунт добавлен!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Присвойте этому аккаунту название (по желанию)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Для этого аккаунта отключена фоновая синхронизация в роуминге."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Отправка ответа…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Писем нет."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Выбрать папку"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Укажите папку для удаленных"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Укажите папку для отправленных"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 9a185553d..0541e67a0 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Načítavajú sa informácie o účte…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Overenie nastavení servera..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Overovanie nastavení protokolu SMTP..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavenie účtu"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Váš účet je nastavený a e-mail je na ceste!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Pomenovať tento účet (nepovinné)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Synchronizácia na pozadí je pre tento účet v roamingu zakázaná."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Odosiela sa odpoveď..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Kto dlho vyberá, nakoniec nič nevyberie."</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Vyberte prieč. servera pre kôš"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Vyberte prieč. serv. pre odosl. položky"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 04ac750bc..46170fe8a 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Pridobivanje podatkov o računu..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Preverjanje nastavitev strežnika ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Preverjanje nastavitev SMTP ..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Nastavitev računa"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Vaš račun je pripravljen in e-pošta je poslana."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Poimenujte račun (neobvezno)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Sinhronizacija v ozadju je za ta račun med gostovanjem onemogočena."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Pošiljanje odgovora ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ni sporočil."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Potisni IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Izbirčna Metka!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Izbira mape za koš v strežniku"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Izbira strežniške mape Poslano"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index f43b91ad6..dbdc8ffca 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Преузимање информација о налогу је у току…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Потврђивање подешавања сервера..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Потврђивање подешавања SMTP сервера…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Подешавање налога"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Налог је подешен и е-пошта стиже!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Именујте овај налог (опционално)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Синхронизација у позадини за овај налог је онемогућена у ромингу."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Слање одговора..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Нема порука."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Бирање, бирање, бирање!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Изаберите директоријум за отпад на серверу"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Изаберите директоријум на серверу за послато"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index ffba7b45e..3ededc3d6 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hämtar kontoinformation…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Validerar serverinställningar ..."</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Validerar SMTP-inställningar ..."</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Kontoinställningar"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Ditt konto är färdigt och snart kan du skicka och ta emot e-postmeddelanden."</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ge kontot ett namn (valfritt)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Bakgrundssynkronisering för det här kontot har inaktiverats vid roaming."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Skickar svar ..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Inga meddelanden."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push för IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Svårt att välja?"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Välj servermapp f. papperskorg"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Välj servermapp för skickat"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index cf83b1d1a..e57b18494 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Inarudisha maelezo ya akaunti"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Uhalalishaji wa mipangilio ya seva…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Inahalalisha mipangilio ya smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Usanidi wa akaunti"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Akaunti yako imesanidiwa, na barua pepe iko njiani!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Ipe akaunti hii jina (ya hiari)"</string>
@@ -395,7 +397,7 @@
     <string name="account_settings_sync_email_enable" msgid="3754115565685222477">"Landanisha barua pepe"</string>
     <string name="account_settings_sync_email_summary" msgid="262964076412310990">"Sawazisha barua pepe za akaunti hii"</string>
     <string name="account_settings_vibrate_when_label" msgid="708477308761702671">"Tetema"</string>
-    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Pia tetema baruapepe inapofika"</string>
+    <string name="account_settings_vibrate_when_summary" msgid="3991584445166247189">"Pia tetema barua pepe inapofika"</string>
     <string name="account_settings_vibrate_when_always" msgid="6739506816960483174">"Kila wakati"</string>
     <string name="account_settings_vibrate_when_silent" msgid="6417076436551648924">"Kukiwa kimya tu"</string>
     <string name="account_settings_vibrate_when_never" msgid="3759680093309511614">"Katu"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ulandanishi wa mandharinyuma ya akaunti hii imelemazwa wakati wa kuzurura."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Inatuma mwitikio…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Hakuna ujumbe."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Shinikiza IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Picky, picky, picky!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Chagua folda taka ya seva"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Chagua folda ya  vipengee vilivyotumwa ya seva"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index eb24bbcf5..ef720e814 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"กำลังเรียกข้อมูลบัญชี..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"กำลังตรวจสอบการตั้งค่าเซิร์ฟเวอร์…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"กำลังตรวจสอบการตั้งค่า smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"การตั้งค่าบัญชี"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"ตั้งค่าบัญชีของคุณแล้ว และอีเมลกำลังมาถึง!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"ตั้งชื่อให้กับบัญชีนี้ (เป็นตัวเลือก)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"การซิงค์พื้นหลังสำหรับบัญชีนี้ถูกปิดใช้งานขณะโรมมิ่ง"</string>
     <string name="confirm_response" msgid="9151965975158906286">"กำลังส่งการตอบกลับ…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"ไม่มีข้อความ"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"ส่งการเข้าถึงแบบ IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"ช่างเลือกจริงๆ เลย!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"เลือกโฟลเดอร์ถังขยะ"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"เลือกโฟลเดอร์รายการที่ส่ง"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 329920678..ff6ad2b12 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Binabawi ang impormasyon ng account…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Pinapatunayan ang mga setting ng server…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Pinapatunayan ang mga setting ng smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Setup ng account"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Naka-set up na ang iyong account at paparating na ang email!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bigyan ng pangalan ang account na ito (opsyonal)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Hindi pinapagana ang background na pag-sync para sa account na ito habang nagro-roam."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Ipinapadala ang tugon…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Walang mga mensahe."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Mapili ka!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Pili folder basurahan server"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Pili folder padala item server"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 16fffb830..7a9edb713 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Hesap bilgileri alınıyor..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Sunucu ayarları doğrulanıyor…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"SMTP ayarları doğrulanıyor…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Hesap kurulumu"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Hesabınız ayarlandı ve e-posta gönderildi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Bu hesaba bir ad ver (isteğe bağlı)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Dolaşımdayken bu hesabın arka plan senkronizasyonu devre dışı bırakılır."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Yanıt gönderiliyor…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"İleti yok."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"titiz, titiz, titiz!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Sunucunun çöp kutusu klasörünü seçin"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Sunucunun gönderilen öğeler klasörünü seçin"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 82c8c4cb5..55633d886 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Отримання інфо про облік. запис…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Перевірка налаштувань сервера…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Перевірка налаштувань SMTP…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Налаштування облікового запису"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Ваш обліковий запис налаштовано. Скоро надійдуть листи!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Назвіть цей обл. запис. (додатково)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"У роумінгу фонову синхронізацію для цього облікового запису вимкнено."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Надсилання відповіді…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"Немає повідомлень."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Push IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Вибрати папку"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Виберіть папку для видалених"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Виберіть папку для надісланих"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index a4cf75bd1..adc4df9cd 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Đang truy xuất thông tin tài khoản…"</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Đang xác thực cài đặt máy chủ…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Đang xác thực cài đặt smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Thiết lập tài khoản"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"Tài khoản của bạn đã được thiết lập và email đang được gửi!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Đặt tên cho tài khoản này (tùy chọn)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Đồng bộ hóa nền cho tài khoản này bị tắt trong khi chuyển vùng."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Đang gửi trả lời..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Không có thư nào."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"IMAP đẩy thư"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Vui lòng chọn!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Chọn thư mục thùng rác trên máy chủ"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Chọn thư mục thư đã gửi trên máy chủ"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a4ba4adc9..5a4fab978 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在检索帐户信息..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"正在验证服务器设置…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"正在验证 SMTP 设置…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"帐户设置"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"您的帐户已设置完毕，可以收发电子邮件了！"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"为此帐户创建名称（可选）"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"漫游时停用了此帐户的后台同步功能。"</string>
     <string name="confirm_response" msgid="9151965975158906286">"正在发送回复…"</string>
     <string name="no_conversations" msgid="5559527390337162819">"无邮件。"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"推送 IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"选择一个文件夹"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"请选择服务器的“已删除邮件”文件夹"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"请选择服务器的“已发送邮件”文件夹"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 318a9418a..6f3e3ead9 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"正在擷取帳戶資訊..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"正在驗證伺服器設定…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"正在驗證 SMTP 設定…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"帳戶設定"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"您的帳戶已設定完成，可以開始收發電子郵件了！"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"設定帳戶名稱 (選擇性)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"系統會在漫遊時停用這個帳戶的背景同步處理。"</string>
     <string name="confirm_response" msgid="9151965975158906286">"正在傳送回應..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"沒有任何郵件。"</string>
-    <string name="imap2_name" msgid="2742745881421883233">"推送 IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"仔細挑選！"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"選取伺服器垃圾桶資料夾"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"選取伺服器寄件備份資料夾"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index e7daebc8d..0ee2895d8 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -245,6 +245,8 @@
     <string name="account_setup_check_settings_retr_info_msg" msgid="4121970450267725664">"Ilanda ulwazi le-akhawunti..."</string>
     <string name="account_setup_check_settings_check_incoming_msg" msgid="2869198335297585862">"Iqinisekisa izilungiselelo zeseva…"</string>
     <string name="account_setup_check_settings_check_outgoing_msg" msgid="4566131393776891419">"Iqinisekisa amasethingi e-smtp…"</string>
+    <!-- no translation found for account_setup_creating_account_msg (6235569720466839946) -->
+    <skip />
     <string name="account_setup_names_title" msgid="8483517350241119291">"Ukumisa i-akhawunti"</string>
     <string name="account_setup_names_headline" msgid="914858472109729140">"I-akhawunti yakho imisiwe, futhi i-imeyli isendleleni!"</string>
     <string name="account_setup_names_account_name_label" msgid="8033895024273259196">"Nike le-akhawunti igama (okokuzikhethela)"</string>
@@ -495,7 +497,10 @@
     <string name="require_manual_sync_message" msgid="7777357288642785955">"Ukuvumelaniswa okungemumva kule-akhawunti ayisebenzi ngesikhathi usazula zula."</string>
     <string name="confirm_response" msgid="9151965975158906286">"Ithumela impendulo..."</string>
     <string name="no_conversations" msgid="5559527390337162819">"Ayikho imilayezo."</string>
-    <string name="imap2_name" msgid="2742745881421883233">"Phusha i-IMAP"</string>
+    <!-- no translation found for imap2_name (7676967165636670733) -->
+    <skip />
+    <!-- no translation found for pop3_name (4037602724794932807) -->
+    <skip />
     <string name="folder_picker_title" msgid="5213735893918108637">"Ukhetho, ukhetho, ukhetho!"</string>
     <string name="trash_folder_selection_title" msgid="8287461989726013461">"Khetha ifolda kadoti wesiphakeli"</string>
     <string name="sent_folder_selection_title" msgid="3868598259968276968">"Khetha ifolda yezinto ezithunyelwe zesiphakeli"</string>