diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index 59648bd2e..8e7ce8303 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -22,6 +22,5 @@
   <string name="delete_account_failed">No ha sido posible eliminar la cuenta</string>
   <string name="mailbox_notify_settings_activity_title">Opciones de notificación</string>
   <string name="mailbox_notify_settings_activity_title_with_mailbox">Opciones de notificación de (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
-  <string name="folder_notify_settings_pref_title">Configuración de notificación de carpeta</string>
-  <string name="label_notification_lights_title">Leds</string>
+  <string name="label_notification_lights_title">Luces</string>
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-gl-rES/cm_strings.xml
similarity index 51%
rename from res/values-vi/cm_strings.xml
rename to res/values-gl-rES/cm_strings.xml
index 5248117ad..3fc875d86 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-gl-rES/cm_strings.xml
@@ -16,12 +16,9 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-  <string name="delete_account">Xoá tài khoản</string>
-  <string name="delete_account_confirmation_msg">Việc này sẽ xoá tất cả cài đặt và tài khoản email <xliff:g id="account">%s</xliff:g>. Thao tác này không thể huỷ.\n\nTiếp tục?</string>
-  <string name="deleting_account_msg">Đang xoá tài khoản\u2026</string>
-  <string name="delete_account_failed">Không thể xoá tài khoản</string>
-  <string name="mailbox_notify_settings_activity_title">Tùy chọn thông báo</string>
-  <string name="mailbox_notify_settings_activity_title_with_mailbox">Tùy chọn thông báo (<xliff:g id="mailbox_name" example="Family">%s </xliff:g>)</string>
-  <string name="folder_notify_settings_pref_title">Thư mục cài đặt thông báo</string>
-  <string name="label_notification_lights_title">Đèn LED</string>
+  <string name="delete_account">Eliminar conta</string>
+  <string name="delete_account_confirmation_msg">Eliminaranse todos os axustes e os correos da conta <xliff:g id="account">%s</xliff:g>. Esta operación non se pode desfacer.\n\nContinuar?</string>
+  <string name="deleting_account_msg">Eliminando a conta\u2026</string>
+  <string name="mailbox_notify_settings_activity_title">Opcións das notificacións</string>
+  <string name="mailbox_notify_settings_activity_title_with_mailbox">Opcións das notificacións (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
 </resources>
diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml
index 84d27c07f..1d762e9ab 100644
--- a/res/values-pt-rPT/cm_strings.xml
+++ b/res/values-pt-rPT/cm_strings.xml
@@ -17,7 +17,7 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="delete_account">Apagar a conta</string>
-  <string name="delete_account_confirmation_msg">Vai apagar todas as definiçoes e e-mails da conta <xliff:g id="account">%s</xliff:g>. Esta operação não pode ser desfeita.\n\nContinuar?</string>
+  <string name="delete_account_confirmation_msg">Isto vai apagar todas as definições e e-mails da conta <xliff:g id="account">%s</xliff:g>. Esta operação não pode ser desfeita.\n\nContinuar?</string>
   <string name="deleting_account_msg">A apagar a conta\u2026</string>
   <string name="delete_account_failed">Não foi possível apagar a conta</string>
   <string name="mailbox_notify_settings_activity_title">Opções de notificação</string>
diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml
index 5b8d52d03..45f123790 100644
--- a/res/values-th/cm_strings.xml
+++ b/res/values-th/cm_strings.xml
@@ -17,11 +17,6 @@
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
   <string name="delete_account">ลบบัญชีผู้ใช้</string>
-  <string name="delete_account_confirmation_msg">นี่จะลบการตั้งค่าและอีเมลทั้งหมดของบัญชี <xliff:g id="account">%s</xliff:g> การกระทำนี้ไม่สาราถรยกเลิกได้ \n\nดำเนินการต่อ?</string>
+  <string name="delete_account_confirmation_msg">สิ่งนี้จะลบการตั้งค่าและอีเมลทั้งหมดของบัญชี <xliff:g id="account">%s</xliff:g> การกระทำนี้ไม่สามารถยกเลิกได้ \n\nต้องการดำเนินการต่อหรือไม่</string>
   <string name="deleting_account_msg">กำลังลบบัญชีผู้ใช้\u2026</string>
-  <string name="delete_account_failed">ไม่สามารถลบบัญชีผู้ใช้ได้</string>
-  <string name="mailbox_notify_settings_activity_title">ตัวเลือกการแจ้งเตือน</string>
-  <string name="mailbox_notify_settings_activity_title_with_mailbox">ตัวเลือกการแจ้งเตือน (<xliff:g id="mailbox_name" example="Family">%s</xliff:g>)</string>
-  <string name="folder_notify_settings_pref_title">ตั้งค่าการแจ้งเตือนโฟลเดอร์</string>
-  <string name="label_notification_lights_title">แสง</string>
 </resources>