diff --git a/email2/res/values-ar/strings.xml b/email2/res/values-ar/strings.xml
index ca7baa174..de4542047 100644
--- a/email2/res/values-ar/strings.xml
+++ b/email2/res/values-ar/strings.xml
@@ -433,23 +433,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> من النتائج من <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"الإعدادات"</string>
-    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"الإعدادات العامة"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"التطبيق"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"التقدم التلقائي"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"اختيار الشاشة التي تظهر بعد حذف رسالة"</string>
-    <!-- no translation found for general_preference_hide_checkboxes_label (2054599123778503930) -->
-    <skip />
-    <!-- no translation found for general_preference_hide_checkboxes_summary (141341137898712712) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
-    <skip />
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"إخفاء مربعات الاختيار"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"في قوائم الرسائل، المس مع الاستمرار للتحديد"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"تأكيد قبل الحذف"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"الرسائل"</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>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"رسالة أحدث"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"رسائل أقدم"</string>
diff --git a/email2/res/values-de/strings.xml b/email2/res/values-de/strings.xml
index c226a21ca..9a0572768 100644
--- a/email2/res/values-de/strings.xml
+++ b/email2/res/values-de/strings.xml
@@ -433,23 +433,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> Ergebnisse von <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Einstellungen"</string>
-    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Allgemeine Einstellungen"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"App"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Automatisch fortfahren"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Was soll nach dem Löschen einer Nachricht angezeigt werden?"</string>
-    <!-- no translation found for general_preference_hide_checkboxes_label (2054599123778503930) -->
-    <skip />
-    <!-- no translation found for general_preference_hide_checkboxes_summary (141341137898712712) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
-    <skip />
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Kontrollkästchen ausblenden"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"In Nachrichtenlisten zum Auswählen berühren und halten"</string>
+    <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_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>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"neuerer Nachricht"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"älterer Nachricht"</string>
diff --git a/email2/res/values-it/strings.xml b/email2/res/values-it/strings.xml
index 296eccab1..92030219c 100644
--- a/email2/res/values-it/strings.xml
+++ b/email2/res/values-it/strings.xml
@@ -433,23 +433,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="RESULTS">%1$d</xliff:g> risultati da <xliff:g id="DOMAIN">%2$s</xliff:g>"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"Impostazioni"</string>
-    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"Impostazioni generali"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"Applicazione"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"Avanzamento automatico"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"Seleziona schermata da visualizzare dopo eliminazione messaggio"</string>
-    <!-- no translation found for general_preference_hide_checkboxes_label (2054599123778503930) -->
-    <skip />
-    <!-- no translation found for general_preference_hide_checkboxes_summary (141341137898712712) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
-    <skip />
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"Nascondi caselle di controllo"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"Negli elenchi di messaggi, tocca e tieni premuto per selezionare"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"Conferma prima di eliminare"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"Messaggi"</string>
+    <string name="general_preference_confirm_send_label" msgid="4548277349553989930">"Conferma prima di inviare"</string>
+    <string name="general_preference_confirm_send_summary" msgid="2695471027185506093">"Messaggi"</string>
     <string name="general_preference_auto_advance_dialog_title" msgid="5405052109452503909">"Passa a"</string>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"Messaggio successivo"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"Messaggio precedente"</string>
diff --git a/email2/res/values-ja/strings.xml b/email2/res/values-ja/strings.xml
index a7f7f7433..ecd15b15b 100644
--- a/email2/res/values-ja/strings.xml
+++ b/email2/res/values-ja/strings.xml
@@ -433,23 +433,16 @@
     <item quantity="other" msgid="7816121892960632123">"<xliff:g id="DOMAIN">%2$s</xliff:g>からの結果: <xliff:g id="RESULTS">%1$d</xliff:g>件"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"設定"</string>
-    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"全般設定"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"アプリケーション"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"自動表示"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"メッセージを削除した後に表示する画面を選択します"</string>
-    <!-- no translation found for general_preference_hide_checkboxes_label (2054599123778503930) -->
-    <skip />
-    <!-- no translation found for general_preference_hide_checkboxes_summary (141341137898712712) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
-    <skip />
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"チェックボックスを表示しない"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"メッセージリストで押し続けて選択する"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"削除前に確認する"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"メッセージ"</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>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"新しいメッセージ"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"古いメッセージ"</string>
diff --git a/email2/res/values-th/strings.xml b/email2/res/values-th/strings.xml
index cc61475d4..21a58f5e7 100644
--- a/email2/res/values-th/strings.xml
+++ b/email2/res/values-th/strings.xml
@@ -433,23 +433,16 @@
     <item quantity="other" msgid="7816121892960632123">"ผลลัพธ์ <xliff:g id="RESULTS">%1$d</xliff:g> รายการจาก <xliff:g id="DOMAIN">%2$s</xliff:g> รายการ"</item>
   </plurals>
     <string name="settings_activity_title" msgid="5185915603716333904">"การตั้งค่า"</string>
-    <!-- no translation found for header_label_general_preferences (8243724566056800991) -->
-    <skip />
+    <string name="header_label_general_preferences" msgid="8243724566056800991">"การตั้งค่าทั่วไป"</string>
     <string name="category_general_preferences" msgid="2742423840964045801">"แอปพลิเคชัน"</string>
     <string name="general_preference_auto_advance_label" msgid="213945004511666631">"เลื่อนไปข้างหน้าโดยอัตโนมัติ"</string>
     <string name="general_preference_auto_advance_summary" msgid="6483439980032715119">"เลือกหน้าจอที่จะแสดงขึ้นหลังจากที่คุณลบข้อความ"</string>
-    <!-- no translation found for general_preference_hide_checkboxes_label (2054599123778503930) -->
-    <skip />
-    <!-- no translation found for general_preference_hide_checkboxes_summary (141341137898712712) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_label (1863245465244241907) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_delete_summary (6710240861010766643) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_label (4548277349553989930) -->
-    <skip />
-    <!-- no translation found for general_preference_confirm_send_summary (2695471027185506093) -->
-    <skip />
+    <string name="general_preference_hide_checkboxes_label" msgid="2054599123778503930">"ซ่อนช่องทำเครื่องหมาย"</string>
+    <string name="general_preference_hide_checkboxes_summary" msgid="141341137898712712">"แตะข้อความในรายการค้างไว้เพื่อเลือก"</string>
+    <string name="general_preference_confirm_delete_label" msgid="1863245465244241907">"ยืนยันก่อนลบ"</string>
+    <string name="general_preference_confirm_delete_summary" msgid="6710240861010766643">"ข้อความ"</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>
     <string name="general_preference_auto_advance_newer" msgid="1336720027570509885">"ข้อความที่ใหม่กว่า"</string>
     <string name="general_preference_auto_advance_older" msgid="8273143493185128646">"ข้อความที่เก่ากว่า"</string>