diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 21f2bf0fc..b572d4280 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -388,9 +388,9 @@
     <string name="account_settings_data_usage" msgid="6669107430575866736">"Uso de datos"</string>
     <string name="account_settings_policies" msgid="6292833636418641840">"Políticas de seguridad"</string>
     <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">"Seleccionar tu carpeta de papelera del servidor"</string>
-    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Seleccionar tu carpeta de papelera del servidor"</string>
+    <string name="system_folders_trash_title" msgid="8470058000681188327">"Carpeta de la papelera"</string>
+    <string name="system_folders_trash_summary" msgid="1258919809198485244">"Selecciona tu carpeta de papelera del servidor"</string>
+    <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Selecciona tu carpeta de papelera del servidor"</string>
     <string name="system_folders_sent_title" msgid="4265722817877075367">"Carpeta de elementos enviados"</string>
     <string name="system_folders_sent_summary" msgid="5529250353569545181">"Seleccionar tu carpeta de elementos enviados del servidor"</string>
     <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Seleccionar tu carpeta de elementos enviados del servidor"</string>
@@ -506,7 +506,7 @@
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Selector de carpetas"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Seleccionar papelera servidor de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Selecciona la papelera del servidor de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="2668629667423320684">"Seleccionar carpeta servidor de <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Crear carpeta"</string>
     <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Cargando lista de carpetas…"</string>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 8e61d3a2f..fb5b10663 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -392,8 +392,8 @@
     <string name="system_folders_trash_summary" msgid="1258919809198485244">"Serveri prügikastikausta valimine"</string>
     <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Serveri prügikastikausta valimine"</string>
     <string name="system_folders_sent_title" msgid="4265722817877075367">"Saadetud üksuste kaust"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Serveri saadetud üksuste kausta valimine"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Serveri saadetud üksuste kausta valimine"</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Serverist saadetud üksuste kausta valimine"</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Serverist saadetud üksuste kausta valimine"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Kiirvastuse muutmine"</string>
     <string name="save_action" msgid="1988862706623227093">"Salvesta"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Sünkrooni kontaktid"</string>
@@ -506,8 +506,8 @@
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Kausta valija"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Valige <xliff:g id="ACCOUNT">%s</xliff:g>-le serveri prügik."</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Valige <xliff:g id="ACCOUNT">%s</xliff:g>-le kaust serverist"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Valige <xliff:g id="ACCOUNT">%s</xliff:g> jaoks serveri prügikast"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Valige <xliff:g id="ACCOUNT">%s</xliff:g> jaoks serverikaust"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Loo kaust"</string>
     <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Kaustaloendi laadimine ..."</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index 678b466c1..91020d079 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -392,8 +392,8 @@
     <string name="system_folders_trash_summary" msgid="1258919809198485244">"Sélectionner le dossier \"Corbeille\" de votre serveur"</string>
     <string name="system_folders_trash_dlg" msgid="4461220303400833402">"Sélectionnez le dossier \"Corbeille\" de votre serveur."</string>
     <string name="system_folders_sent_title" msgid="4265722817877075367">"Dossier des éléments envoyés"</string>
-    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Sélectionner le dossier des éléments envoyés de votre serveur"</string>
-    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Sélectionnez le dossier des éléments envoyés de votre serveur."</string>
+    <string name="system_folders_sent_summary" msgid="5529250353569545181">"Sélectionnez le dossier des éléments envoyés de votre serveur."</string>
+    <string name="system_folders_sent_dlg" msgid="7071006714702094762">"Sélectionner le dossier des éléments envoyés du serveur"</string>
     <string name="edit_quick_response_dialog" msgid="4322494050816995390">"Modifier une réponse rapide"</string>
     <string name="save_action" msgid="1988862706623227093">"Enregistrer"</string>
     <string name="account_settings_sync_contacts_enable" msgid="1369272986009573218">"Synchroniser les contacts"</string>
@@ -506,8 +506,8 @@
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Sélecteur de dossier"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Sélect. dossier \"Corbeille\" du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Sélect. dossier d\'éléments envoyés par serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Sélect. dossier \"Corbeille\" du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Sélect. dossier d\'éléments envoyés du serveur pour <xliff:g id="ACCOUNT">%s</xliff:g>."</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Créer un dossier"</string>
     <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Chargement de la liste des dossiers en cours…"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 5874d1991..18a437877 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -506,8 +506,8 @@
     <string name="imap2_name" msgid="7676967165636670733">"IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Mappaválasztó"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Szerver Kuka mappájának kiválasztása ehhez: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
-    <string name="sent_folder_selection_title" msgid="2668629667423320684">"A szerver küldött mappájának választása ehhez: <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Szerver Kuka mappájának kiválasztása – <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="sent_folder_selection_title" msgid="2668629667423320684">"Szerver Elküldött mappájának kiválasztása – <xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Mappa létrehozása"</string>
     <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Mappalista betöltése..."</string>
 </resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8440014a7..70c3e374c 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -446,7 +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>
-    <string name="general_preference_swipe_delete_summary" msgid="922880566493325308">"以滑动方式删除列表中的邮件"</string>
+    <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 3da775730..ab65c0120 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -506,7 +506,7 @@
     <string name="imap2_name" msgid="7676967165636670733">"I-IMAP"</string>
     <string name="pop3_name" msgid="4037602724794932807">"POP3"</string>
     <string name="folder_picker_title" msgid="860241987640527156">"Isikhethi sefolda"</string>
-    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Khetha ifolda kadoti yesiphakeli ye-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
+    <string name="trash_folder_selection_title" msgid="8052880079616386185">"Khetha ifolda kadoti yeseva ye-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="sent_folder_selection_title" msgid="2668629667423320684">"Khetha ifolda yezinto ezithunyele ye-<xliff:g id="ACCOUNT">%s</xliff:g>"</string>
     <string name="create_new_folder" msgid="2726544180243210741">"Dala ifolda"</string>
     <string name="account_waiting_for_folders_msg" msgid="6504836014579036923">"Ilayisha uhlu lwamafolda…"</string>