diff --git a/build/res/values-af/strings.xml b/build/res/values-af/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-af/strings.xml
+++ b/build/res/values-af/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-am/strings.xml b/build/res/values-am/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-am/strings.xml
+++ b/build/res/values-am/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-bg/strings.xml b/build/res/values-bg/strings.xml
index a5f408ee1..e18b04fa8 100644
--- a/build/res/values-bg/strings.xml
+++ b/build/res/values-bg/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"приложение/имейл – ls"</string>
 </resources>
diff --git a/build/res/values-cs/strings.xml b/build/res/values-cs/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-cs/strings.xml
+++ b/build/res/values-cs/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-es-rUS/strings.xml b/build/res/values-es-rUS/strings.xml
index 21bbdd250..08eacc9f9 100644
--- a/build/res/values-es-rUS/strings.xml
+++ b/build/res/values-es-rUS/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"IMAP"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"POP3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"aplicación/email-ls"</string>
 </resources>
diff --git a/build/res/values-ja/strings.xml b/build/res/values-ja/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-ja/strings.xml
+++ b/build/res/values-ja/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-ms/strings.xml b/build/res/values-ms/strings.xml
index a5f408ee1..2fea72199 100644
--- a/build/res/values-ms/strings.xml
+++ b/build/res/values-ms/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"aplikasi/e-mel-Ialah"</string>
 </resources>
diff --git a/build/res/values-pt-rPT/strings.xml b/build/res/values-pt-rPT/strings.xml
index a5f408ee1..bcbff72b1 100644
--- a/build/res/values-pt-rPT/strings.xml
+++ b/build/res/values-pt-rPT/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"aplicação/email-ls"</string>
 </resources>
diff --git a/build/res/values-pt/strings.xml b/build/res/values-pt/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-pt/strings.xml
+++ b/build/res/values-pt/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-ro/strings.xml b/build/res/values-ro/strings.xml
index a5f408ee1..b11779ed3 100644
--- a/build/res/values-ro/strings.xml
+++ b/build/res/values-ro/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"aplicaţie/e-mailuri"</string>
 </resources>
diff --git a/build/res/values-sk/strings.xml b/build/res/values-sk/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-sk/strings.xml
+++ b/build/res/values-sk/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-tr/strings.xml b/build/res/values-tr/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-tr/strings.xml
+++ b/build/res/values-tr/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/build/res/values-vi/strings.xml b/build/res/values-vi/strings.xml
index a5f408ee1..d3d67b6da 100644
--- a/build/res/values-vi/strings.xml
+++ b/build/res/values-vi/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"ứng dụng/email-ls"</string>
 </resources>
diff --git a/build/res/values-zh-rCN/strings.xml b/build/res/values-zh-rCN/strings.xml
index a5f408ee1..d3fb869e5 100644
--- a/build/res/values-zh-rCN/strings.xml
+++ b/build/res/values-zh-rCN/strings.xml
@@ -19,11 +19,9 @@
     <string name="account_manager_type_pop3" msgid="8174497360548988962">"com.android.pop3"</string>
     <string name="account_manager_type_imap" msgid="6434501957228470595">"com.android.imap"</string>
     <string name="intent_exchange" msgid="4425264471285375163">"com.android.email.EXCHANGE_INTENT"</string>
-    <!-- no translation found for intent_account_manager_entry (4793371513689260894) -->
-    <skip />
+    <string name="intent_account_manager_entry" msgid="4793371513689260894">"com.android.email.ACCOUNT_MANAGER_ENTRY_INTENT"</string>
     <string name="authority_email_provider" msgid="6455239255042402247">"com.android.email.provider"</string>
     <string name="protocol_imap" msgid="5533297182544773791">"imap"</string>
     <string name="protocol_pop3" msgid="5006920400711584822">"pop3"</string>
-    <!-- no translation found for application_mime_type (1159136363376500335) -->
-    <skip />
+    <string name="application_mime_type" msgid="1159136363376500335">"application/email-ls"</string>
 </resources>
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 2fdbd2b22..1c808d4ba 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Kennisgewingsinstellings"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Datagebruik"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Sekuriteitsbeleide"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Stelselvouers"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Asblikvouer"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Kies jou bediener se asblikvouer"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Kies jou bediener se asblikvouer"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Gestuurde items se vouer"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Kies jou bedienergestuur items se vouer"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Kies jou bedienergestuur items se vouer"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Redigeer vinnige antwoord"</string>
     <string name="save_action" msgid="1988862706623227093">"Stoor"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sinkroniseer kontakte"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Bevestig voor uitvee"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Boodskappe"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Sleep om uit te vee"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Vee \'n boodskap in die lys uit deur te sleep"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Bevestig voor stuur"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Boodskappe"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Gaan voort na"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Geen boodskappe nie."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Vouerkieser"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Kies bediener se asblikvouer vir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Kies bedienergestuurde items se vouer vir <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Skep vouer"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Laai tans vouerlys..."</string>
 </resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 8882a7e9b..74edf58ed 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"የማሳወቂያ ቅንብሮች"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"የውሂብ አጠቃቀም"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"የደህንነት ቋሚ መመሪያዎች"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"የስርዓት አቃፊዎች"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"የመጣያ አቃፊ"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"የአገልጋይዎ መጣያ አቃፊውን ይምረጡ"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"የአገልጋይዎ መጣያ አቃፊውን ይምረጡ"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"የተላኩ ንጥሎች አቃፊ"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"የአገልጋይዎ የተላኩ ንጥሎች አቃፊውን ይምረጡ"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"የአገልጋይዎ የተላኩ ንጥሎች አቃፊውን ይምረጡ"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"ፈጣን ምላሽ አርትዕ"</string>
     <string name="save_action" msgid="1988862706623227093">"አስቀምጥ"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"ዕውቂያዎች አስምር"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ከመሰረዝህ በፊት አረጋግጥ"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"መልእክቶች"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"ለመሰረዝ ያንሸራቱ"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"በማንሸራተት ዝርዝር ላይ ያለ መልዕክት ይሰርዙ"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ከመላክህ በፊት አረጋግጥ"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"መልእክቶች"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"ለ የላቀ"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"መልዕክቶች የሉም።"</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"የአቃፊ መራጭ"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"ለ<xliff:g id="ACCOUNT">%s</xliff:g> የአገልጋይ መጣያ ይምረጡ"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"የተላኩ የ<xliff:g id="ACCOUNT">%s</xliff:g> ንጥሎች አገልጋይን ምረጥ"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"አቃፊ ፍጠር"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"የአቃፊ ዝርዝር በመጫን ላይ…"</string>
 </resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1b62cf115..9c9910c68 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"تأكيد قبل الحذف"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"الرسائل"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"مرر بسرعة لإجراء حذف"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"يمكنك حذف رسالة في القائمة عن طريق التمرير السريع"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"تأكيد قبل الإرسال"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"الرسائل"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"التوجه إلى"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index fa8716d1f..1a0c97c30 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Пацвердзіць перад выдаленнем"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Паведамленні"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Прагарнiце, каб выдалiць"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Выдаліць паведамленне ў спісе, правёўшы пальцам"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Пацвердзіць перад адпраўкай"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Паведамленні"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Пераход да"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index b777f2e06..d6d3413ea 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Настройки за известия"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Използване на данни"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Правила за сигурност"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Системни папки"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Папка „Кошче“"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Изберете папката „Кошче“ на сървъра си"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Изберете папката „Кошче“ на сървъра си"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Папка за изпратените елементи"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Изберете папката за изпратените елементи на сървъра си"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Изберете папката за изпратените елементи на сървъра си"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Редактиране на бърз отговор"</string>
     <string name="save_action" msgid="1988862706623227093">"Запазване"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Синхронизиране на контакти"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Потвърждаване преди изтриване"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Съобщения"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Прекарайте пръст, за да изтриете"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Изтриване на съобщение в списъка чрез прекарване на пръст"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Потвърждаване преди изпращане"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Съобщения"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Преминаване към"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Няма съобщения."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Инструмент за избор на папки"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Изберете папка „Кошче“ на сървъра за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Изберете папка за изпр. елементи на сървъра за <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Създаване на папка"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Списъкът с папки се зарежда…"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index b1b141eab..b79ff5ac0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavení upozornění"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Využití dat"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Zásady zabezpečení"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Systémové složky"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Složka Koš"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Vyberte složku Koš svého serveru."</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Vyberte složku Koš svého serveru."</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Složka odeslaných položek"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Vyberte složku odeslaných položek svého serveru."</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Vyberte složku odeslaných položek svého serveru."</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Upravit rychlou odpověď"</string>
     <string name="save_action" msgid="1988862706623227093">"Uložit"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovat kontakty"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Před smazáním potvrdit"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Zprávy"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Mazat po přejetí prstem"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Smazat zprávu v seznamu přejetím"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Před odesláním potvrdit"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Zprávy"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pokračovat na"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Žádné zprávy."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Výběr složky"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Vyberte Koš serveru pro účet <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Vyberte složku odesl. položek <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Vytvořit složku"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Načítání seznamu složek…"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3769977f1..7754c5312 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -165,7 +165,7 @@
     <string name="message_view_always_show_pictures_button" msgid="6523810929103546865">"Immer anzeigen"</string>
     <string name="message_view_always_show_pictures_prompt" msgid="7685500276479967959">"Bilder von diesem Absender immer anzeigen"</string>
     <string name="message_view_always_show_pictures_confirmation" msgid="6838463134312859448">"Bilder von diesem Absender werden automatisch angezeigt."</string>
-    <string name="message_view_invite_view" msgid="5521032519960111675">"Im Kalender anzeigen"</string>
+    <string name="message_view_invite_view" msgid="5521032519960111675">"Im Kalender ansehen"</string>
     <string name="message_view_invite_title" msgid="3418949733434713805">"Kalendereinladung"</string>
     <string name="message_view_invite_text" msgid="1212799906603873708">"Teilnehmen?"</string>
     <string name="message_view_invite_accept" msgid="744546668021679819">" Ja"</string>
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Vor dem Löschen bestätigen"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Nachrichten"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Zum Löschen wischen"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Nachricht in der Liste durch Wischen löschen"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Vor dem Senden bestätigen"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Nachrichten"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Weiter zu"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 64c2c81f9..233a792c8 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configuración de notificación"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de datos"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de seguridad"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Carpetas del sistema"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Carpeta de papelera"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Selecciona la carpeta de papelera de tu servidor."</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Selecciona la carpeta de papelera de tu servidor."</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Carpeta de elementos enviados"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Selecciona la carpeta de elementos enviados de tu servidor."</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Selecciona la carpeta de elementos enviados de tu servidor."</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar respuesta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Guardar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar antes de eliminar"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mensajes"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Deslizar para eliminar"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Deslizar un mensaje de la lista para eliminarlo"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar antes de enviar"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mensajes"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Avanzar a"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"No hay mensajes."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Selector de carpeta"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecciona la carpeta de papelera del servidor para <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Selecciona la carpeta de elementos enviados del servidor para <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Crear carpeta"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Cargando lista de carpetas..."</string>
 </resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 99916fd3e..8e61d3a2f 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Kinnitamine enne kustutamist"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Sõnumid"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Pühkige kustutamiseks"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Kustutage sõnum loendist pühkides"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Kinnitamine enne saatmist"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Sõnumid"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Edasiminek"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 7cddca136..31737b763 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"تأیید قبل از حذف"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"پیام‌ها"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"برای حذف با انگشت روی صفحه بکشید"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"حذف یک پیام در لیست با کشیدن انگشت روی صفحه"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"تأیید قبل از ارسال"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"پیام‌ها"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"پیشروی به"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index f6ca10ccc..77862822e 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Vahvista ennen poistamista"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Viestit"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Poista liu\'uttamalla"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Poista viesti luettelosta liu\'uttamalla"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Vahvista ennen lähettämistä"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Viestit"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Siirry ruutuun"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 5d8aa85bf..678b466c1 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmer avant suppression"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Messages"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Faire glisser pour supprimer"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Supprimer un message de la liste en le faisant glisser"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmer avant envoi"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Messages"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Afficher"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 58f031fee..46e4805ee 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"हटाने से पहले पुष्‍टि करें"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"संदेश"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"हटाने के लिए स्वाइप करें"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"स्‍वाइप करके सूची में से संदेश हटाएं"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"भेजने से पहले पुष्‍टि करें"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"संदेश"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"इससे आगे"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index c10d98a78..47ba19c4d 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Potvrdite prije brisanja"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Poruke"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Trznite prstom za brisanje"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Brisanje poruke na popisu prijelazom po njima"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Potvrdite prije slanja"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Poruke"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Prijeđi na"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 9c106bb87..5874d1991 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Megerősítés kérése törlés előtt"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Üzenetek"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Törléshez csúsztassa az ujját"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Csúsztatással törölhet egy üzenetet a listáról"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Megerősítés kérése küldés előtt"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Üzenetek"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Továbblépés ide:"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 8a91a480e..5eb30d4ac 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Konfirmasi sebelum menghapus"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Pesan"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Gesek untuk menghapus"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Hapus pesan dalam daftar dengan menggesek"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Konfirmasi sebelum mengirim"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Pesan"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Majukan ke"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index c17e8923b..4c33229d1 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知設定"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"データ使用"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"セキュリティポリシー"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"システムフォルダ"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"ゴミ箱フォルダ"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"サーバーのゴミ箱フォルダを選択"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"サーバーのゴミ箱フォルダを選択"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"送信済みフォルダ"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"サーバーの送信済みフォルダを選択"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"サーバーの送信済みフォルダを選択"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"クイック返信の編集"</string>
     <string name="save_action" msgid="1988862706623227093">"保存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"連絡先を同期"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"削除前に確認する"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"メッセージ"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"スワイプして削除"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"スワイプしてリスト内のメッセージを削除する"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"送信前に確認する"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"メッセージ"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"表示する画面:"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"メッセージはありません。"</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"フォルダの選択"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g>のサーバーのゴミ箱フォルダを選択してください"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g>のサーバーの送信済みフォルダを選択してください"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"フォルダを作成"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"フォルダリストを読み込み中…"</string>
 </resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 34827435f..c93ef0fec 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"삭제하기 전에 확인"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"메일"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"스와이프하여 삭제"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"스와이프하여 목록의 메시지 삭제"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"보내기 전에 확인"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"메일"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"이동"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e363685a0..68560388c 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Patvirtinti prieš ištrinant"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Pranešimai"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Perbraukite, kad ištrintumėte"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Perbraukdami ištrinkite sąraše pateiktą pranešimą"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Patvirtinti prieš siunčiant"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Pranešimai"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pereiti į"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e8d44b50e..73de280e2 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Apstiprināt pirms dzēšanas"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Ziņojumi"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Vilkt, lai dzēstu"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Dzēst ziņojumu sarakstā, velkot ar pirkstu"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Apstiprināt pirms sūtīšanas"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Ziņojumi"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pāriet uz"</string>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 71e92b74d..46fa76600 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Tetapan pemberitahuan"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Penggunaan data"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Dasar keselamatan"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Folder sistem"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Folder sampah"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Pilih folder sampah pelayan anda"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Pilih folder sampah pelayan anda"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Folder item yang dihantar"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Pilih folder item dihantar pelayan anda"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Pilih folder item yang dihantar pelayan anda"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Edit respons pantas"</string>
     <string name="save_action" msgid="1988862706623227093">"Simpan"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Segerakkan kenalan"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Sahkan sebelum memadam"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mesej"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Leret untuk memadam"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Padam mesej dalam senarai dengan meleret"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Sahkan sebelum menghantar"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mesej"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mara ke"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Tiada mesej."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Pemilih folder"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Pilih folder sampah pelayan untuk <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Pilih folder item yang dihantar pelayan untuk <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Buat folder"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Memuatkan senarai folder..."</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 55a2c5af8..cbf5802b1 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Potwierdź usuwanie"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Wiadomości"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Usuwaj po przesunięciu palcem"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Usuń wiadomość z listy, przesuwając palcem"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Potwierdź wysyłanie"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Wiadomości"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Przejdź do"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 3b23e338f..f49ca0986 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Definições de notificação"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Utilização de dados"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de segurança"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Pastas do sistema"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Pasta de lixo"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Selecionar a pasta de lixo do seu servidor"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Selecionar a pasta de lixo do seu servidor"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Pasta de itens enviados"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Selecionar a pasta de itens enviados do seu servidor"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Selecionar a pasta de itens enviados do seu servidor"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar resposta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Guardar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contactos"</string>
@@ -512,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Não tem mensagens."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Seletor de pastas"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecionar a pasta de lixo do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Selecionar a pasta de itens enviados do servidor para <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Criar pasta"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"A carregar a lista de pastas..."</string>
 </resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 1d3391fe1..92fd4f798 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Configurações de notificação"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de dados"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de segurança"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Pastas do sistema"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Pasta Lixeira"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Selecione a pasta de itens enviados do servidor"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Selecione a pasta de itens enviados do servidor"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Pasta de itens enviados"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Selecione a pasta de itens enviados do servidor"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Selecione a pasta de itens enviados do servidor"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editar resposta rápida"</string>
     <string name="save_action" msgid="1988862706623227093">"Salvar"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizar contatos"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmar antes de excluir"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mensagens"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Deslize para excluir"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Exclua mensagens na lista deslizando o dedo"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmar antes de enviar"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mensagens"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Avançar até"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Nenhuma mensagem."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Seletor de pasta"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Pasta Lixeira do servidor p/ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Pasta Enviados do servidor p/ <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Criar pasta"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Carregando a lista de pastas..."</string>
 </resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 6ddcb8ebb..c06216bd0 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Setări pentru notificări"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Utilizarea datelor"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Politici de securitate"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Dosare sistem"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Dosarul coş de gunoi"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Selectaţi dosarul coş de gunoi al serverului dvs."</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Selectaţi dosarul coş de gunoi al serverului dvs."</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Dosar articole trimise"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Selectaţi dosarul cu articole trimise al serverului dvs."</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Selectaţi dosarul cu articole trimise al serverului dvs."</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Editaţi răspunsul rapid"</string>
     <string name="save_action" msgid="1988862706623227093">"Salvaţi"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sincronizaţi persoanele din agendă"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Confirmaţi înainte de a şterge"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mesaje"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Glisaţi pentru a şterge"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Ştergeţi un mesaj din listă prin glisare"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Confirmaţi înainte de a trimite"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mesaje"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Înaintaţi la"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Niciun mesaj."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Selector dosare"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Dosarul coş de gunoi pentru <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Dosar articole trimise pentru <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Creaţi un dosar"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Se încarcă lista cu dosare…"</string>
 </resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index dff3f5751..753335418 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Подтверждать удаление"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Сообщения"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Удалять смахиванием"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Удалять сообщения пролистыванием"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Подтверждать отправку"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Сообщения"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Переходить к"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 6b5c6f756..e74e28b7b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Nastavenia upozornení"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Spotreba dát"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Pravidlá zabezpečenia"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Systémové priečinky"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Priečinok Kôš"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Vyberte priečinok Kôš na vašom serveri"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Vyberte priečinok Kôs na vašom serveri"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Priečinok odoslaných položiek"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Vyberte priečinok odoslaných položiek na vašom serveri"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Vyberte priečinok odoslaných položiek na vašom serveri"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Upraviť rýchlu odpoveď"</string>
     <string name="save_action" msgid="1988862706623227093">"Uložiť"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchronizovať kontakty"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Pred odstránením potvrdiť"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Správy"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Odstránenie posunutím"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Odstránenie správy v zozname posunutím"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Pred odoslaním potvrdiť"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Správy"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Pokračovať do"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Žiadne správy."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Výber priečinka"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Vyberte prieč. Kôš na serv. pre účet <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Vyberte prieč. odosl. polož. na serveri pre účet <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Vytvoriť priečinok"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Prebieha načítavanie zoznamu priečinkov..."</string>
 </resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 3bc0f1f3d..b5cfab1ae 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Potrditev pred brisanjem"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Sporočila"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Za brisanje povlecite"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Izbris sporočila na seznamu s potezo prsta"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Potrditev pred pošiljanjem"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Sporočila"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Naprej do"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 47714a236..4b1f89272 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Потврди пре брисања"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Поруке"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Листај за брисање"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Листајте да бисте избрисали поруку са листе"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Потврди пре слања"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Поруке"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Пређи на"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index a59f5a852..5a79ee954 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ยืนยันก่อนลบ"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"ข้อความ"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"กวาดนิ้วเพื่อลบ"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"ลบข้อความในรายการโดยการกวาดนิ้ว"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"ยืนยันก่อนส่ง"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"ข้อความ"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"เลื่อนไปที่"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index d1e29a142..82e938841 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Kumpirmahin bago tanggalin"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Mga Mensahe"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"I-swipe upang tanggalin"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Magtanggal ng mensahe sa listahan sa pamamagitan ng pag-swipe"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Kumpirmahin bago ipadala"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Mga Mensahe"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Mag-advance sa"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index f5dc8e726..a0f2fce1e 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Bildirim ayarları"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Veri kullanımı"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Güvenlik politikaları"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Sistem klasörleri"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Çöp kutusu klasörü"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Sunucunuzun çöp kutusu klasörünü seçin"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Sunucunuzun çöp kutusu klasörünü seçin"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Gönderilen öğeler klasörü"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Sunucunuzun gönderilen öğeler klasörünü seçin"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Sunucunuzun gönderilen öğeler klasörünü seçin"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Hızlı yanıtı düzenle"</string>
     <string name="save_action" msgid="1988862706623227093">"Kaydet"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Kişileri senkronize et"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Silmeden önce onayla"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"İletiler"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Silmek için hızlıca kaydırın"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Hızlıca kaydırarak listeden bir ileti silin"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Göndermeden önce onayla"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"İletiler"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Şu iletiye ilerle:"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"İleti yok."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Klasör seçici"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"<xliff:g id="ACCOUNT">%s</xliff:g> için sunucunun çöp kutusu klasörünü seçin"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"<xliff:g id="ACCOUNT">%s</xliff:g> için sunucunun gönderilen öğeler klasörünü seçin"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Klasör oluştur"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Klasör listesi yükleniyor…"</string>
 </resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 1a51cff1c..445454b42 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"Cài đặt thông báo"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Sử dụng dữ liệu"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Chính sách bảo mật"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"Thư mục hệ thống"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Thư mục thùng rác"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Chọn thư mục thùng rác trên máy chủ của bạn"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Chọn thư mục thùng rác trên máy chủ của bạn"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"Thư mục chứa mục được gửi"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Chọn thư mục chứa mục được gửi trên máy chủ của bạn"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Chọn thư mục chứa mục được gửi trên máy chủ của bạn"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Chỉnh sửa trả lời nhanh"</string>
     <string name="save_action" msgid="1988862706623227093">"Lưu"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Đồng bộ hóa danh bạ"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Xác nhận trước khi xóa"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Thư"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Vuốt để xóa"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Xóa thư trong danh sách bằng cách vuốt"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Xác nhận trước khi gửi"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Thư"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Chuyển sang"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"Không có thư nào."</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"Công cụ chọn thư mục"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Chọn thư mục thùng rác trên máy chủ cho <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Chọn thư mục chứa mục được gửi trên máy chủ cho <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Tạo thư mục"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Đang tải danh sách thư mục…"</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index eab3f0cbd..8440014a7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -387,20 +387,13 @@
     <string name="account_settings_notifications" msgid="1042620094281375043">"通知设置"</string>
     <string name="account_settings_data_usage" msgid="6669107430575866736">"数据使用"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"安全政策"</string>
-    <!-- no translation found for system_folders_title (2934406494244347991) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_title (8470058000681188327) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_summary (1258919809198485244) -->
-    <skip />
-    <!-- no translation found for system_folders_trash_dlg (4461220303400833402) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_title (4265722817877075367) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_summary (5529250353569545181) -->
-    <skip />
-    <!-- no translation found for system_folders_sent_dlg (7071006714702094762) -->
-    <skip />
+    <string name="system_folders_title" msgid="2934406494244347991">"系统文件夹"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"垃圾箱文件夹"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"选择您服务器的垃圾箱文件夹"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"选择您服务器的垃圾箱文件夹"</string>
+    <string name="system_folders_sent_title" msgid="4265722817877075367">"已发送项目文件夹"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"选择您服务器的已发送项目文件夹"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"选择您服务器的已发送项目文件夹"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"编辑快速回复"</string>
     <string name="save_action" msgid="1988862706623227093">"保存"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"同步联系人"</string>
@@ -453,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"删除前先确认"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"邮件"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"滑动即可删除"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"以滑动方式删除列表中的邮件"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"发送前先确认"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"邮件"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"跳转至"</string>
@@ -513,13 +505,9 @@
     <string name="no_conversations" msgid="5559527390337162819">"无邮件。"</string>
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
-    <!-- no translation found for folder_picker_title (860241987640527156) -->
-    <skip />
-    <!-- no translation found for trash_folder_selection_title (8052880079616386185) -->
-    <skip />
-    <!-- no translation found for sent_folder_selection_title (2668629667423320684) -->
-    <skip />
+    <string name="folder_picker_title" msgid="860241987640527156">"文件夹选择器"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"选择 <xliff:g id="ACCOUNT">%s</xliff:g> 服务器垃圾箱文件夹"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"选择 <xliff:g id="ACCOUNT">%s</xliff:g> 服务器已发送项目文件夹"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"新建文件夹"</string>
-    <!-- no translation found for account_waiting_for_folders_msg (6504836014579036923) -->
-    <skip />
+    <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"正在加载文件夹列表…"</string>
 </resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 69863d998..56bf8469f 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"刪除前需確認"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"郵件"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"滑動即可刪除"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"以滑動方式刪除清單中的郵件"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"傳送前需確認"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"郵件"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"推進至"</string>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index a9f932b82..3da775730 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -446,8 +446,7 @@
     <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Qinisekisa ngaphambi kokususa"</string>
     <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Imilayezo"</string>
     <string name="general_preference_swipe_delete_label" msgid="9056241302035595141">"Swayipha ukuze ususe"</string>
-    <!-- no translation found for general_preference_swipe_delete_summary (922880566493325308) -->
-    <skip />
+    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"Susa uhlu ngokuswayipha"</string>
     <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Qinisekisa ngaphambi kokuthumela"</string>
     <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Imilayezo"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Dlulela ku"</string>