diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index aa1d5cf81..feb7591e9 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -137,8 +137,6 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="read_receipt_enabled">Taotleb lugemise kinnitust</string>
   <string name="read_receipt_disabled">Ei taotle lugemise kinnitust</string>
   <string name="add_attachment_action">Lisa manus</string>
-  <string name="add_attachment_action_image">Lisa manus (pilt)</string>
-  <string name="add_attachment_action_video">Lisa manus (video)</string>
   <string name="empty_trash_action">Tühjenda prügikast</string>
   <string name="expunge_action">Pühi ära</string>
   <string name="clear_local_folder_action">Puhasta kohalikud sõnumid</string>
@@ -704,8 +702,6 @@ Palun saada infot probleemidest, soovitavatest lisafunktsioonidest ja küsi küs
   <string name="font_size_medium">Keskmine</string>
   <string name="font_size_large">Suur</string>
   <string name="font_size_larger">Suurem</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
   <string name="miscellaneous_preferences">Muu</string>
   <!--APG related-->
   <string name="error_apg_version_not_supported">Installitud APG versioon ei ole toetatud.</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl-rES/strings.xml
index 4c737e097..df0051bb9 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl-rES/strings.xml
@@ -134,8 +134,6 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="read_receipt_enabled">Pedirase confirmación de lectura</string>
   <string name="read_receipt_disabled">Non se pedirá confirmación de lectura</string>
   <string name="add_attachment_action">Engadir anexo</string>
-  <string name="add_attachment_action_image">Engadir anexo (imaxe)</string>
-  <string name="add_attachment_action_video">Engadir anexo (vídeo)</string>
   <string name="empty_trash_action">Baleirar papeleira</string>
   <string name="expunge_action">Purgar</string>
   <string name="clear_local_folder_action">Limpar mensaxes locais</string>
@@ -695,11 +693,7 @@ Envía informes de erro, contribúe con novas funcionalidades e pregunta o que d
   <string name="font_size_medium">Mediana</string>
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Moi grande</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Usar \"Engadir anexo (imaxe)\" ou \"Engadir anexo (vídeo)\" para anexar imaxes ou vídeos con Galería 3D.</string>
   <string name="miscellaneous_preferences">Miscelánea</string>
-  <string name="misc_preferences_attachment_description">Mostrar botóns para engadir anexos de imaxe e vídeo</string>
   <!--APG related-->
   <string name="error_activity_not_found">Non hai un aplicativo para executar esta acción.</string>
   <string name="error_apg_version_not_supported">Non se admite a versión instalada de APG.</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 69f0795a7..d986fffa1 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -138,8 +138,6 @@ Lūdzu sūtiet kļūdu ziņojumus, iesakiet uzlabojumus un uzdodiet jautājumus
   <string name="read_receipt_enabled">Pieprasīt izlasīšanas atskaiti</string>
   <string name="read_receipt_disabled">Neprasīt izlasīšanas atskaiti</string>
   <string name="add_attachment_action">Pievienot pielikumu</string>
-  <string name="add_attachment_action_image">Pievienot pielikumu (bildi)</string>
-  <string name="add_attachment_action_video">Pievienot pielikumu (video)</string>
   <string name="empty_trash_action">Iztukšot miskasti</string>
   <string name="expunge_action">Izmest</string>
   <string name="clear_local_folder_action">Izdzēst ierīcē esošās vēstules</string>
@@ -731,13 +729,7 @@ pat <xliff:g id="messages_to_load">%d</xliff:g> vairāk</string>
   <string name="font_size_medium">Vidējs</string>
   <string name="font_size_large">Liels</string>
   <string name="font_size_larger">Lielāks</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Pārbaudiet \"Iestatījumi\" -&gt; \"Izmantot galerijas kļūdu apvedceļu\", lai varētu pievienotu bildes vai video, izmantojot Gallery 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Izmantot \"Pievienot pielikumu (bildi)\" vai \"Pievienot pielikumu (video)\", lai pievienotu bildes vai videoklipus ar Gallery 3D.</string>
   <string name="miscellaneous_preferences">Dažādi</string>
-  <string name="misc_preferences_attachment_title">Izmantot galerijas kļūdu apvedceļu</string>
-  <string name="misc_preferences_attachment_description">Rādīt pogas, lai pievienotu bildi/video kā pielikumus (izmantojot Gallery 3D kļūdu apvedceļu)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Šai darbībai nav atrasta atbilstoša aplikācija.</string>
   <string name="error_apg_version_not_supported">Instalētā APG versija netiek atbalstīta.</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index f748e8665..b0b738b2b 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -137,8 +137,6 @@ Vennligst send feilmeldinger, forbedringer og still spørsmål hos
   <string name="read_receipt_enabled">Kommer til å be om lesekvittering</string>
   <string name="read_receipt_disabled">Kommer ikke til å be om lesekvittering</string>
   <string name="add_attachment_action">Legg til vedlegg</string>
-  <string name="add_attachment_action_image">Legg til vedlegg (bilde)</string>
-  <string name="add_attachment_action_video">Legg til vedlegg (video)</string>
   <string name="empty_trash_action">Tøm søppeldunk</string>
   <string name="expunge_action">Tilintetgjør</string>
   <string name="clear_local_folder_action">Fjern lokale meldinger</string>
@@ -661,8 +659,6 @@ Vis neste melding som standard etter meldingssletting</string>
   <string name="font_size_medium">Medium</string>
   <string name="font_size_large">Stor</string>
   <string name="font_size_larger">Større</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
   <string name="miscellaneous_preferences">Diverse</string>
   <!--APG related-->
   <string name="error_activity_not_found">Ingen egnede program ble funnet for denne handlingen.</string>