Remove gallery bug work-around

This bug was present in the Gallery app shipped with Android 2.0.
The time has come to say good-bye. We will never forget you! But only because you're part of our Git history.

res/menu/message_compose_option.xml

@@ -39,16 +39,4 @@
         android:title="@string/read_receipt"
         android:icon="?attr/iconActionRequestReadReceipt"
     />
-    <item
-        android:id="@+id/add_attachment_image"
-        android:title="@string/add_attachment_action_image"
-        android:icon="?attr/iconActionAddAttachment"
-        android:visible="false"
-    />
-    <item
-        android:id="@+id/add_attachment_video"
-        android:title="@string/add_attachment_action_video"
-        android:icon="?attr/iconActionAddAttachment"
-        android:visible="false"
-    />
 </menu>

res/values-ca/strings.xml

@@ -137,8 +137,6 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="read_receipt_enabled">Es farà una petició per la confirmació de lectura</string>
   <string name="read_receipt_disabled">No es faran més peticions per les confirmacions de lectura</string>
   <string name="add_attachment_action">Afegeix adjunt</string>
-  <string name="add_attachment_action_image">Afegeix adjunt (Imatge)</string>
-  <string name="add_attachment_action_video">Afegeix adjunt (Vídeo)</string>
   <string name="empty_trash_action">Buida paperera</string>
   <string name="expunge_action">Elimina</string>
   <string name="clear_local_folder_action">Neteja missatges locals</string>
@@ -715,13 +713,7 @@ Si us plau, envia\'ns els errors, contribueix a millorar-lo a
   <string name="font_size_medium">Mitjà</string>
   <string name="font_size_large">Gran</string>
   <string name="font_size_larger">Més gran</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Comprova \"Configuració\" -&gt; \"Utilitza la galeria la Galeria d\'errors\" per poder adjuntar imatges o vídeos utilitzant la Galeria 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Utilitza \"Afegeix adjunt (Imatge)\" or \"Afegeix adjunt (Vídeo)\" per afegir imatges o vídeos amb la Galeria 3D.</string>
   <string name="miscellaneous_preferences">Miscel·lània</string>
-  <string name="misc_preferences_attachment_title">Utilitza la Galeria d\'errors</string>
-  <string name="misc_preferences_attachment_description">Mostra els botons per afegir adjunts d\'imatge/vídeo (per treballar amb els errors de la Galeria 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">No s\'ha trobat cap aplicació idònia per a aquesta acció.</string>
   <string name="error_apg_version_not_supported">Versió APG instal·lada no suportada.</string>

res/values-cs/strings.xml

@@ -137,8 +137,6 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="read_receipt_enabled">Potvrzení o přečtení bude vyžadováno</string>
   <string name="read_receipt_disabled">Potvrzení o přečtení nebude vyžadováno</string>
   <string name="add_attachment_action">Přidat přílohu</string>
-  <string name="add_attachment_action_image">Přidat přílohu (obrázek)</string>
-  <string name="add_attachment_action_video">Přidat přílohu (video)</string>
   <string name="empty_trash_action">Vysypat koš</string>
   <string name="expunge_action">Vymazat</string>
   <string name="clear_local_folder_action">Vyčistit místní zprávy</string>
@@ -715,13 +713,7 @@ Posílejte prosím chybová hlášení, přispívejte novými funkcemi a ptejte
   <string name="font_size_medium">Střední</string>
   <string name="font_size_large">Velký</string>
   <string name="font_size_larger">Největší</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Zaškrtněte \"Možnosti\" -&gt; \"Obejít chybu Galerie\", abyste byli schopni připojit obrázky nebo video pomocí Galerie 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Použijte \"Přidat přílohu (obrázek)\" nebo \"Přidat přílohu (video)\" k připojení obrázků a videa pomocí Galerie 3D.</string>
   <string name="miscellaneous_preferences">Různé</string>
-  <string name="misc_preferences_attachment_title">Obejít chybu Galerie</string>
-  <string name="misc_preferences_attachment_description">Zobrazit tlačítka k připojení obrázku/videa jako přílohy (kvůli chybě v Galerie 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Pro tuto akci nebyla nalezena žádná vhodná aplikace.</string>
   <string name="error_apg_version_not_supported">Nainstalovaná verze APG není podporována.</string>

res/values-da/strings.xml

@@ -134,8 +134,6 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="read_receipt_enabled">Der vil blive anmodet om kvittering for modtagelse</string>
   <string name="read_receipt_disabled">Der vil ikke blive anmodet om kvittering for modtagelse</string>
   <string name="add_attachment_action">Vedhæft fil</string>
-  <string name="add_attachment_action_image">Vedhæft (billede)</string>
-  <string name="add_attachment_action_video">Vedhæft (Video)</string>
   <string name="empty_trash_action">Tøm papirkurv</string>
   <string name="expunge_action">Ryd helt</string>
   <string name="clear_local_folder_action">Fjern lokalt lagrede mails</string>
@@ -709,13 +707,7 @@ Vær venlig at sende fejlrapporter, anmodning om nye funktioner, og spørgsmål
   <string name="font_size_medium">Stor</string>
   <string name="font_size_large">Større</string>
   <string name="font_size_larger">Størst</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Kontroller \"Indstillinger\" -&gt; \"Benyt Gallery bug work-around\" for at kunne vedhæfte billeder og videoer med Gallery 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Benyt \"Tilføj vedhæft (billede)\" eller \"Tilføj vedhæftning (video)\" for at kunne vedhæfte billeder eller videoer med Gallery 3D.</string>
   <string name="miscellaneous_preferences">Diverse</string>
-  <string name="misc_preferences_attachment_title">Benyt Gallery bug work-around</string>
-  <string name="misc_preferences_attachment_description">Vis knapper til vedhæftning af billede/video (måde at omgå fejl i Gallery 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Kunne ikke finde noget program som kan udføre denne handling.</string>
   <string name="error_apg_version_not_supported">Den installerede version af APG understørttes ikke.</string>

res/values-de/strings.xml

@@ -136,8 +136,6 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="read_receipt_enabled">Eine Empfangsbestätigung wird angefordert</string>
   <string name="read_receipt_disabled">Es wird keine Empfangsbestätigung angefordert</string>
   <string name="add_attachment_action">Anhang hinzufügen</string>
-  <string name="add_attachment_action_image">Anhang hinzufügen (Bild)</string>
-  <string name="add_attachment_action_video">Anhang hinzufügen (Video)</string>
   <string name="empty_trash_action">Papierkorb leeren</string>
   <string name="expunge_action">Bereinigen (Expunge)</string>
   <string name="clear_local_folder_action">Lokale Nachrichten löschen</string>
@@ -724,13 +722,7 @@ Um Fehler zu melden, neue Funktionen vorzuschlagen oder Fragen zu stellen, besuc
   <string name="font_size_medium">Mittel</string>
   <string name="font_size_large">Groß</string>
   <string name="font_size_larger">Größer</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Wählen Sie \'Einstellungen\' -&gt; \'Galerie-Workaround aktivieren\', um Bilder oder Videos mit Hilfe der 3D-Galerie hinzufügen zu können.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Verwenden Sie \'Anhang hinzufügen (Bild)\' oder \'Anhang hinzufügen (Video)\', um Bilder oder Videos mit der 3D-Galerie hinzuzufügen.</string>
   <string name="miscellaneous_preferences">Verschiedenes</string>
-  <string name="misc_preferences_attachment_title">Galerie-Workaround</string>
-  <string name="misc_preferences_attachment_description">Schaltflächen zum Hinzufügen von Bild- und Video-Anhängen anzeigen (um Fehler in 3D-Galerie zu umgehen)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Keine geeignete Anwendung für diese Aktion gefunden.</string>
   <string name="error_apg_version_not_supported">Die installierte APG-Version wird nicht unterstützt.</string>

res/values-el/strings.xml

@@ -136,8 +136,6 @@
   <string name="read_receipt_enabled">Θα ζητηθεί απόδειξη ανάγνωσης</string>
   <string name="read_receipt_disabled">Δεν θα ζητηθεί απόδειξη ανάγνωσης</string>
   <string name="add_attachment_action">Προσθήκη συνημμένου</string>
-  <string name="add_attachment_action_image">Προσθήκη συνημμένης εικόνας</string>
-  <string name="add_attachment_action_video">Προσθήκη συνημμένου βίντεο</string>
   <string name="empty_trash_action">Άδειασμα σκουπιδιών</string>
   <string name="expunge_action">Εξάλειψη</string>
   <string name="clear_local_folder_action">Καθαρισμός τοπικών μηνυμάτων</string>
@@ -714,13 +712,7 @@
   <string name="font_size_medium">Μεσαίο</string>
   <string name="font_size_large">Μεγάλο</string>
   <string name="font_size_larger">Μεγαλύτερο</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Ελέγξτε \'Ρυθμίσεις\' -&gt; \'Παράκαμψη σφάλματος πινακοθήκης\' για να μπορείτε να συνάψετε εικόνες ή βίντεο με το Gallery 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Χρήση \'Προσθήκη συνημμένου (Εικόνα)\' ή \'Προσθήκη συνημμένου (Βίντεο)\' για να συνάψετε εικόνες ή βίντεο με το Gallery 3D.</string>
   <string name="miscellaneous_preferences">Διάφορα</string>
-  <string name="misc_preferences_attachment_title">Παράκαμψη σφάλματος πινακοθήκης</string>
-  <string name="misc_preferences_attachment_description">Προβολή πλήκτρων για προσθήκη συνημμένων εικόνας/βίντεο (παράκαμψη του σφάλματος Gallery 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Δεν βρέθηκε κατάλληλη εφαρμογή για αυτή την ενέργεια.</string>
   <string name="error_apg_version_not_supported">Η εγκατεστημένη έκδοση APG δεν υποστηρίζεται.</string>

res/values-es/strings.xml

@@ -137,8 +137,6 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="read_receipt_enabled">Se solicitará confirmación de lectura</string>
   <string name="read_receipt_disabled">No se solicitará confirmación de lectura</string>
   <string name="add_attachment_action">Añadir adjunto</string>
-  <string name="add_attachment_action_image">Añadir adjunto (imagen)</string>
-  <string name="add_attachment_action_video">Añadir adjunto (vídeo)</string>
   <string name="empty_trash_action">Vaciar Papelera</string>
   <string name="expunge_action">Purgar</string>
   <string name="clear_local_folder_action">Borrar mensajes locales</string>
@@ -726,13 +724,7 @@ Por favor, envía los errores detectados, contribuye con nuevas funcionalidades
   <string name="font_size_medium">Mediana</string>
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Muy Grande</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Comprobar \"Configuración\" -&gt; \"Usar Galería\" para poder adjuntar imágenes y vídeos utilizando la Galería 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Usar \"Añadir adjunto (Imagen)\" o \"Añadir adjunto (Vídeo)\" para Añadir imágenes o Vídeos con Galería 3D</string>
   <string name="miscellaneous_preferences">Varios</string>
-  <string name="misc_preferences_attachment_title">Usar galería</string>
-  <string name="misc_preferences_attachment_description">Mostrar botones para Añadir adjuntos de imagen/vídeo</string>
   <!--APG related-->
   <string name="error_activity_not_found">No existe aplicación para realizar esta acción.</string>
   <string name="error_apg_version_not_supported">No se admite esta versión de APG.</string>

res/values-eu/strings.xml

@@ -137,8 +137,6 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="read_receipt_enabled">Irakurragiria eskatuko da</string>
   <string name="read_receipt_disabled">Ez da irakurragiria eskatuko</string>
   <string name="add_attachment_action">Eranskina gehitu</string>
-  <string name="add_attachment_action_image">Eranskina gehitu (Irudia)</string>
-  <string name="add_attachment_action_video">Eranskina gehitu (Bideoa)</string>
   <string name="empty_trash_action">Zakarrontzia hustu</string>
   <string name="expunge_action">Suntsitu</string>
   <string name="clear_local_folder_action">Mezu lokalak garbitu</string>
@@ -715,13 +713,7 @@ Arazoen berri emateko, ezaugarri berriak gehitzeko eta galderak egiteko
   <string name="font_size_medium">Ertaina</string>
   <string name="font_size_large">Handia</string>
   <string name="font_size_larger">Handiagoa</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">\"Ezarpenak\" -&gt; \"Galeriako arazoa sahiestu\" gaitu 3D galeriako irudi edo bideoak erantsi ahal izateko.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">\"Eranskina gehitu (Irudia)\" edo \"Eranskina gehitu (Video)\" erabili 3D galeriatik irudi edo bideoak eransteko.</string>
   <string name="miscellaneous_preferences">Bestelakoak</string>
-  <string name="misc_preferences_attachment_title">Galeriako arazoa sahiestu</string>
-  <string name="misc_preferences_attachment_description">Irudi/bideoak eransteko botoiak ikusi (3D galeriako arazoa sahiesteko)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Ez da honetarako aplikaziorik topatu.</string>
   <string name="error_apg_version_not_supported">Instalatutako APG bertsioa ezin da erabili.</string>

res/values-fi/strings.xml

@@ -138,8 +138,6 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="read_receipt_enabled">Vastaanottokuittaus pyydetään</string>
   <string name="read_receipt_disabled">Ei pyydä lukukuittausta</string>
   <string name="add_attachment_action">Lisää liite</string>
-  <string name="add_attachment_action_image">Lisää liite (Kuva)</string>
-  <string name="add_attachment_action_video">Video</string>
   <string name="empty_trash_action">Tyhjennä roskakori</string>
   <string name="expunge_action">Poista</string>
   <string name="clear_local_folder_action">Poista paikalliset viestit</string>
@@ -726,13 +724,7 @@ Virheraportit, osallistuminen projektiin ja kysymykset: Mene osoitteeseen
   <string name="font_size_medium">Keskikoko</string>
   <string name="font_size_large">Suuri</string>
   <string name="font_size_larger">Suurin</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Tarkista Asetukset -&gt; Ota käyttöön Gallery-ohjelmavirheen kierto mahdollistaaksesi kuvien tai videoiden liittämisen Gallery 3D -ohjelmalla.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Käytä Lisää liite (kuva)- tai Lisää liite (video) -toimintoa Gallery 3D:n kuvan tai videon liittämiseksi.</string>
   <string name="miscellaneous_preferences">Muut</string>
-  <string name="misc_preferences_attachment_title">Ota käyttöön Gallery -ohjelmavirheen kierto</string>
-  <string name="misc_preferences_attachment_description">Näytä painikkeet liitteen (video/kuva) lisäämiseksi (Gallery 3D -ohjelmavirheen kiertäminen)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Toiminnolle ei löytynyt sopivaa ohjelmaa.</string>
   <string name="error_apg_version_not_supported">Asennettua APG-versiota ei tueta.</string>

res/values-fr/strings.xml

@@ -135,8 +135,6 @@ Veuillez envoyer les rapports de bogues, suggérer de nouvelles fonctions et pos
   <string name="read_receipt_enabled">Un accusé de lecture sera demandé</string>
   <string name="read_receipt_disabled">Un accusé de lecture ne sera pas demandé</string>
   <string name="add_attachment_action">Ajouter une pièce jointe</string>
-  <string name="add_attachment_action_image">Joindre une image</string>
-  <string name="add_attachment_action_video">Joindre une vidéo</string>
   <string name="empty_trash_action">Vider la corbeille</string>
   <string name="expunge_action">Supprimer</string>
   <string name="clear_local_folder_action">Effacer les messages locaux</string>
@@ -725,13 +723,7 @@ jusqu\'à <xliff:g id="messages_to_load">%d</xliff:g> de plus</string>
   <string name="font_size_medium">Moyen</string>
   <string name="font_size_large">Grand</string>
   <string name="font_size_larger">Plus grand</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Cochez «\u00A0Paramètres\u00A0» &gt; «\u00A0Utiliser le contournement du bogue de la Galerie\u00A0» pour être capable d\'attacher des images ou des vidéos en utilisant Galerie 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Utiliser «\u00A0Joindre une image\u00A0» ou «\u00A0Joindre une vidéo\u00A0» pour joindre des images ou vidéos avec Galerie 3D</string>
   <string name="miscellaneous_preferences">Divers</string>
-  <string name="misc_preferences_attachment_title">Utiliser le contournement du bogue de la Galerie</string>
-  <string name="misc_preferences_attachment_description">Afficher les boutons pour joindre des images ou des vidéos (pour contourner le bogue de la Galerie 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Aucune application adéquate n\'a été trouvée pour cette action.</string>
   <string name="error_apg_version_not_supported">La version installée d\'APG n\'est pas prise en charge.</string>

res/values-gl/strings.xml

@@ -117,8 +117,6 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
   <string name="mark_as_unread_action">Marcar Non Lido</string>
   <string name="add_cc_bcc_action">Engadir Cc/Bcc</string>
   <string name="add_attachment_action">Engadir adxunto</string>
-  <string name="add_attachment_action_image">Engadir adxunto (Imaxe)</string>
-  <string name="add_attachment_action_video">Engadir adxunto (Vídeo)</string>
   <string name="empty_trash_action">Valeirar Papelera</string>
   <string name="expunge_action">Erradicar</string>
   <string name="clear_local_folder_action">Borrar mensaxes locais</string>
@@ -643,13 +641,7 @@ Por favor, envía os erros detectados, contribúe con novas funcionalidas e preg
   <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-->
-  <string name="message_compose_buggy_gallery">Comprobar \"Configuración\" -&gt; \"Usar Galería\" para poder adxuntar imaxes e videos usando a Galería 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Usar \"Engadir adxunto (Imaxe)\" oo \"Engadir adxunto (Vídeo)\" para Engadir imaxes ou Vídeos con Galería 3D</string>
   <string name="miscellaneous_preferences">Varios</string>
-  <string name="misc_preferences_attachment_title">Usar galería</string>
-  <string name="misc_preferences_attachment_description">Amosar botóns para Engadir adxuntos de imaxe/vídeo</string>
   <!--APG related-->
   <string name="error_activity_not_found">Non existe aplicación para executar esta acción</string>
   <string name="error_apg_version_not_supported">Non se soporta esta versión de APG</string>

res/values-hu/strings.xml

@@ -136,8 +136,6 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="read_receipt_enabled">Olvasási jelentés lesz kérve</string>
   <string name="read_receipt_disabled">Nem lesz Olvasási jelentés lesz kérve</string>
   <string name="add_attachment_action">Melléklet</string>
-  <string name="add_attachment_action_image">Kép-melléklet csatolása</string>
-  <string name="add_attachment_action_video">Videó-melléklet csatolása</string>
   <string name="empty_trash_action">Lomtár ürítése</string>
   <string name="expunge_action">Biztonságos törlés</string>
   <string name="clear_local_folder_action">Helyi üzenetek törlése</string>
@@ -703,13 +701,7 @@ Hibajelentéseivel hozzájárul az újabb verziók tökéletesítéséhez, kérd
   <string name="font_size_medium">Közepes</string>
   <string name="font_size_large">Nagy</string>
   <string name="font_size_larger">Nagyobb</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Kapcsolja be a \"Beállítások\" -&gt; \"Galéria hiba\" ha 3D galériából akar képet mellékelni.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Használja a \"Kép csatolása\" vagy \"Videó csatolása\" opciót ha 3D galériából szeretne választani.</string>
   <string name="miscellaneous_preferences">Egyéb</string>
-  <string name="misc_preferences_attachment_title">Galéria hiba kikerülése</string>
-  <string name="misc_preferences_attachment_description">Gombok megjelenítése a kép/videó csatoláshoz (a 3D Galéria hiba kikerülése érdekében)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Nincs megfelelő alkalmazás ehhez a művelethez.</string>
   <string name="error_apg_version_not_supported">A telepített APG verzió nem támogatott.</string>

res/values-it/strings.xml

@@ -137,8 +137,6 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="read_receipt_enabled">Notifica di lettura attiva</string>
   <string name="read_receipt_disabled">Non richiederà la notifica di lettura</string>
   <string name="add_attachment_action">Aggiungi allegato</string>
-  <string name="add_attachment_action_image">Aggiungi allegato (Immagine)</string>
-  <string name="add_attachment_action_video">Aggiungi allegato (Video)</string>
   <string name="empty_trash_action">Svuota cestino</string>
   <string name="expunge_action">Rimuovi messaggi eliminati</string>
   <string name="clear_local_folder_action">Cancella messaggi locali</string>
@@ -726,13 +724,7 @@ Invia le tue segnalazioni, suggerisci nuove funzionalità e chiedi informazioni
   <string name="font_size_medium">Medio</string>
   <string name="font_size_large">Grande</string>
   <string name="font_size_larger">Più grande</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Controlla \"Impostazioni\" -&gt; \"Aggira bug Galleria immagini\" per allegare immagini o video usando Galleria 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Utilizza \"Aggiungi allegato (Immagini)\" o \"Aggiungi allegato (Video)\" per allegare immagini o video con Galleria 3D.</string>
   <string name="miscellaneous_preferences">Varie</string>
-  <string name="misc_preferences_attachment_title">Aggira bug Galleria immagini</string>
-  <string name="misc_preferences_attachment_description">Visualizza i pulsanti per allegare immagini/video (evita bug della Galleria 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Nessuna applicazione trovata per questa azione.</string>
   <string name="error_apg_version_not_supported">La versione di APG installata non è supportata.</string>

res/values-iw/strings.xml

@@ -114,8 +114,6 @@
   <string name="read_receipt_enabled">נדרש אישור לקריאה</string>
   <string name="read_receipt_disabled">לא נדרש אישור קריאה</string>
   <string name="add_attachment_action">צרף קובץ</string>
-  <string name="add_attachment_action_image">הוסף קובץ (תמונה)</string>
-  <string name="add_attachment_action_video">הוסף קובת (וידאו)</string>
   <string name="empty_trash_action">רוקן אשפה</string>
   <string name="expunge_action">רוקן</string>
   <string name="clear_local_folder_action">נקה הודעות מקומיות</string>
@@ -610,13 +608,7 @@
   <string name="font_size_medium">בינוני</string>
   <string name="font_size_large">גדול</string>
   <string name="font_size_larger">ענק</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">סמן \"הגדרות\" -&gt; \"השתמש בעקיפת באג הגלריה\" כדי שתוכל לצרף תמונות או קטעי וידאו לגלריית 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">השתמש ב \ "הוסף קובץ מצורף (תמונה) \" או \ "הוסף קובץ מצורף (וידאו) \" כדי לצרף תמונות או קטעי וידאו באמצעות גלריית 3D.</string>
   <string name="miscellaneous_preferences">שונות</string>
-  <string name="misc_preferences_attachment_title">השתמש בעקיפת באג הגלריה</string>
-  <string name="misc_preferences_attachment_description">הצג כפתורים כדי להוסיף קבצי תמונה / וידאו (כדי לעקוף את באג גלריית 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">לא נמצא ישום שיכול לבצע פעולה זו.</string>
   <string name="error_apg_version_not_supported">גרסת APG המותקנת אינה נתמכת.</string>

res/values-ja/strings.xml

@@ -137,8 +137,6 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="read_receipt_enabled">開封確認を要求</string>
   <string name="read_receipt_disabled">開封確認を要求しない</string>
   <string name="add_attachment_action">添付追加</string>
-  <string name="add_attachment_action_image">添付ファイル追加 (画像)</string>
-  <string name="add_attachment_action_video">添付ファイル追加 (動画)</string>
   <string name="empty_trash_action">ゴミ箱を空に</string>
   <string name="expunge_action">完全削除(Expunge)</string>
   <string name="clear_local_folder_action">ローカルのメッセージをクリア</string>
@@ -726,13 +724,7 @@ K-9 は大多数のメールクライアントと同様に、ほとんどのフ
   <string name="font_size_medium">中</string>
   <string name="font_size_large">大</string>
   <string name="font_size_larger">極大</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">ギャラリ3Dを使って画像/動画を添付するには\"設定\" -&gt; \"ギャラリのバグ回避\"をチェックしてください</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">ギャラリ3Dで画像/動画を添付するには\"添付ファイル追加 (画像)\"や\"添付ファイル追加 (動画)\" を使ってください</string>
   <string name="miscellaneous_preferences">その他</string>
-  <string name="misc_preferences_attachment_title">ギャラリのバグ回避</string>
-  <string name="misc_preferences_attachment_description">添付ファイルに画像/動画を追加するボタンを表示する(ギャラリ3Dバグを回避するため)</string>
   <!--APG related-->
   <string name="error_activity_not_found">この操作のためのアプリケーションが見つかりません</string>
   <string name="error_apg_version_not_supported">インストールされているAPGは、サポートされていないバージョンです</string>

res/values-ko/strings.xml

@@ -136,8 +136,6 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="read_receipt_enabled">읽음 확인을 요청함</string>
   <string name="read_receipt_disabled">읽음 확인을 요청하지 않음</string>
   <string name="add_attachment_action">첨부 추가</string>
-  <string name="add_attachment_action_image">첨부 추가 (이미지)</string>
-  <string name="add_attachment_action_video">첨부 추가 (비디오)</string>
   <string name="empty_trash_action">휴지통 비우기</string>
   <string name="expunge_action">폐기</string>
   <string name="clear_local_folder_action">로컬 메시지 삭제</string>
@@ -713,13 +711,7 @@ K-9 메일은 대부분의 무료 hotmail 계정을 지원하지 않으며, 다
   <string name="font_size_medium">중간</string>
   <string name="font_size_large">크게</string>
   <string name="font_size_larger">더 크게</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">갤러리 3D에서 이미지나 비디오를 첨부하려면 \"설정\" -&gt; \"갤러리 버그 회피\"를 확인하십시오.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">갤러리 3D에서 \"첨부 추가 (이미지)\" 혹은 \"첨부 추가 (비디오)\"를 통해 이미지나 비디오를 첨부할 수 있습니다.</string>
   <string name="miscellaneous_preferences">기타 설정</string>
-  <string name="misc_preferences_attachment_title">갤러리 버그 회피</string>
-  <string name="misc_preferences_attachment_description">이미지/비디오 첨부 파일을 추가하는 버튼을 보여 줍니다 (갤러리 3D 버그를 회피할 수 있음)</string>
   <!--APG related-->
   <string name="error_activity_not_found">이 작동에 대해 적절한 애플리케이션을 찾을 수 없습니다.</string>
   <string name="error_apg_version_not_supported">설치된 APG 버전을 지원하지 않습니다.</string>

res/values-lt/strings.xml

@@ -137,8 +137,6 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="read_receipt_enabled">Prašys perskaitymo patvirtinimo</string>
   <string name="read_receipt_disabled">Neprašys perskaitymo patvirtinimo</string>
   <string name="add_attachment_action">Priedo priedą</string>
-  <string name="add_attachment_action_image">Pridėti priedą (paveikslėlis)</string>
-  <string name="add_attachment_action_video">Pridėti priedą (Video)</string>
   <string name="empty_trash_action">Išvalyti šiukšliadėžę</string>
   <string name="expunge_action">Išvalyti</string>
   <string name="clear_local_folder_action">Išvalyti vietinius laiškus</string>
@@ -716,13 +714,7 @@ Praneškite apie klaidas, pridėkite naujų galimybių ir užduokite klausimus m
   <string name="font_size_medium">Vidutinis</string>
   <string name="font_size_large">Didelis</string>
   <string name="font_size_larger">Didesnis</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Norėdami pridėti paveikslėlius ir video naudojant Gallery 3D, pažymėkite „Nustatymai“ -&gt; „Naudoti galerijos klaidos apėjimą“</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Norėdami pridėti paveikslėlius ir video naudojant Gallery 3D naudokite „Pridėti priedą (paveikslėlis)“ ar „Pridėti priedą (Video)“.</string>
   <string name="miscellaneous_preferences">Kita</string>
-  <string name="misc_preferences_attachment_title">Naudoti galerijos klaidos apėjimą</string>
-  <string name="misc_preferences_attachment_description">Rodyti mygtukus kurie prideda vaizdo/video priedus (Gallery 3D klaidos apėjimas)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Šiai programai nerasta tinkamo veiksmo.</string>
   <string name="error_apg_version_not_supported">Įdiegta APG versija nepalaikoma.</string>

res/values-nl/strings.xml

@@ -137,8 +137,6 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="read_receipt_enabled">Lees rapport vragen</string>
   <string name="read_receipt_disabled">Geen lees rapport vragen</string>
   <string name="add_attachment_action">Voeg bijlage toe</string>
-  <string name="add_attachment_action_image">Voeg bijlage toe (Afbeelding)</string>
-  <string name="add_attachment_action_video">Voeg bijlage toe (Video)</string>
   <string name="empty_trash_action">Prullenbak legen</string>
   <string name="expunge_action">Wissen</string>
   <string name="clear_local_folder_action">Lokale berichten wissen</string>
@@ -714,13 +712,7 @@ Graag foutrapporten, bijdrage nieuwe functies en vragen stellen op
   <string name="font_size_medium">Gemiddeld</string>
   <string name="font_size_large">Groot</string>
   <string name="font_size_larger">Groter</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Controleer \"Instellingen\" -&gt; \"Use Gallery bug work-around\" to be able to attach images or videos using Gallery 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Gebruik \"Bijlage toevoegen (Afbeelding)\" of \"Bijlage toevoegen (Video)\" to attach images or videos with Gallery 3D.</string>
   <string name="miscellaneous_preferences">Diversen</string>
-  <string name="misc_preferences_attachment_title">Gebruik Gallery bug work-around</string>
-  <string name="misc_preferences_attachment_description">Laat knoppen zien om afbeelding/video bijlage toe te voegen (to work around a Gallery 3D bug)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Geen geschikte applicatie gevonden voor deze aktie.</string>
   <string name="error_apg_version_not_supported">De geïnstalleerde APG versie wordt niet ondersteund.</string>

res/values-pl/strings.xml

@@ -137,8 +137,6 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="read_receipt_enabled">Żadaj powiadomienia o przeczytaniu</string>
   <string name="read_receipt_disabled">Nie wymagaj powiadomienia o przeczytaniu</string>
   <string name="add_attachment_action">Dodaj załącznik</string>
-  <string name="add_attachment_action_image">Dodaj załącznik (Zdjęcie)</string>
-  <string name="add_attachment_action_video">Dodaj załącznik (Film)</string>
   <string name="empty_trash_action">Opróżnij kosz</string>
   <string name="expunge_action">Wyczyść</string>
   <string name="clear_local_folder_action">Wyczyść wiadomości lokalne</string>
@@ -714,13 +712,7 @@ Wszelkie zgłoszenia usterek, zapytania oraz nowe pomysły prosimy przesyłać z
   <string name="font_size_medium">Średnia</string>
   <string name="font_size_large">Duża</string>
   <string name="font_size_larger">Wielka</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Włącz \"Obejdź błędy w Galerii\" aby móc załączać zdjęcia oraz filmy używając Galerii 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Użyj \"Dodaj załącznik (Zdjęcie)\" lub \"Dodaj załącznik (Film)\" aby je dodać używając Galerii 3D.</string>
   <string name="miscellaneous_preferences">Różne</string>
-  <string name="misc_preferences_attachment_title">Obejdź błędy w Galerii</string>
-  <string name="misc_preferences_attachment_description">Wyświetla przyciski dodawania zdjęć oraz filmów jako załączników</string>
   <!--APG related-->
   <string name="error_activity_not_found">Nie znaleiono odpowiedniej aplikacji.</string>
   <string name="error_apg_version_not_supported">Zainstalowana wersja APG nie jest wspierana.</string>

res/values-pt-rBR/strings.xml

@@ -136,8 +136,6 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="read_receipt_enabled">Confirmação de leitura será requisitada</string>
   <string name="read_receipt_disabled">Confirmação de leitura não será requisitada</string>
   <string name="add_attachment_action">Incluir anexo</string>
-  <string name="add_attachment_action_image">Incluir anexo (Imagem)</string>
-  <string name="add_attachment_action_video">Incluir anexo (Video)</string>
   <string name="empty_trash_action">Esvaziar Lixeira</string>
   <string name="expunge_action">Expurgar</string>
   <string name="clear_local_folder_action">Limpar mensagens locais</string>
@@ -710,13 +708,7 @@ Por favor, nos envie relatórios de bugs, contribua para novas melhorias e faça
   <string name="font_size_medium">Médio</string>
   <string name="font_size_large">Maior</string>
   <string name="font_size_larger">Grande</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Ativar em \"Configurações\" a opção \"Solução do bug da Galeria\" para poder anexar imagens ou vídeos utilizando a Galeria 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Usar \"Incluir anexo (Imagem)\" ou \"Incluir anexo (Video)\" para anexar imagens ou videos da Galeria 3D.</string>
   <string name="miscellaneous_preferences">Diversos</string>
-  <string name="misc_preferences_attachment_title">Solução do bug da Galeria</string>
-  <string name="misc_preferences_attachment_description">Mostrar botões para incluir anexos de imagem/video (para contornar problemas utilizando Gallery 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Nenhum aplicativo adequado para esta ação foi encontrado.</string>
   <string name="error_apg_version_not_supported"> A versão da APG instalada não é suportada.</string>

res/values-ru/strings.xml

@@ -137,8 +137,6 @@ K-9 Mail — почтовый клиент для Android.
   <string name="read_receipt_enabled">Запросить уведомление о прочтении</string>
   <string name="read_receipt_disabled">Без уведомления о прочтении</string>
   <string name="add_attachment_action">Вложение</string>
-  <string name="add_attachment_action_image">Изображение</string>
-  <string name="add_attachment_action_video">Видео</string>
   <string name="empty_trash_action">Очистить корзину</string>
   <string name="expunge_action">Стереть</string>
   <string name="clear_local_folder_action">Стереть локальные</string>
@@ -725,13 +723,7 @@ K-9 Mail — почтовый клиент для Android.
   <string name="font_size_medium">Большой</string>
   <string name="font_size_large">Огромный</string>
   <string name="font_size_larger">Гигантский</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Включите в настройках \"Обход ошибки Галереи 3D\" для её использования</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Используйте дествия \"Изображение\" или \"Видео\" для вложения с помощью Галереи 3D</string>
   <string name="miscellaneous_preferences">Разное</string>
-  <string name="misc_preferences_attachment_title">Обход ошибки Галереи 3D</string>
-  <string name="misc_preferences_attachment_description">Показать действия вложения изображений и видео</string>
   <!--APG related-->
   <string name="error_activity_not_found">Подходящее приложение не найдено</string>
   <string name="error_apg_version_not_supported">Установленная версия APG не поддерживается</string>

res/values-sk/strings.xml

@@ -137,8 +137,6 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="read_receipt_enabled">Potvrdenie o prečítaní bude vyžadované</string>
   <string name="read_receipt_disabled">Potvrdenie o prečítaní nebude vyžadované</string>
   <string name="add_attachment_action">Pridať prílohu</string>
-  <string name="add_attachment_action_image">Pridať prílohu (obrázok)</string>
-  <string name="add_attachment_action_video">Pridať prílohu (video)</string>
   <string name="empty_trash_action">Vyprázdniť kôš</string>
   <string name="expunge_action">Vymazať</string>
   <string name="clear_local_folder_action">Vymazať správy</string>
@@ -725,13 +723,7 @@ Prosím, nahlasujte prípadné chyby, prispievajte novými funkciami a pýtajte
   <string name="font_size_medium">Stredné</string>
   <string name="font_size_large">Veľké</string>
   <string name="font_size_larger">Väčšie</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Skontrolujte \"Nastavenia\" -&gt; \"Používať riešenie chyby pre Galériu\", aby ste boli schopný pripojiť obrázky alebo videá pomocou Galérie 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Použite \"Pridať prílohu (obrázok)\" alebo \"Pridať prílohu (video)\" pre pridanie obrázkov a videí pomocou Galérie 3D.</string>
   <string name="miscellaneous_preferences">Rôzne</string>
-  <string name="misc_preferences_attachment_title">Používať riešenie chyby pre Galériu</string>
-  <string name="misc_preferences_attachment_description">Zobraziť tlačidlá pre pridanie príloh (obrázky, videá) pre riešenie chyby Galérie 3D</string>
   <!--APG related-->
   <string name="error_activity_not_found">Nebola nájdená žiadna vhodná aplikácia pre túto akciu.</string>
   <string name="error_apg_version_not_supported">Nainštalovaná verzia APG nie je podporovaná.</string>

res/values-sv/strings.xml

@@ -137,8 +137,6 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <string name="read_receipt_enabled">Kommer att begära läskvitto</string>
   <string name="read_receipt_disabled">Kommer inte att begära läskvitto</string>
   <string name="add_attachment_action">Lägg till bilaga</string>
-  <string name="add_attachment_action_image">Lägg till bilaga (Bild)</string>
-  <string name="add_attachment_action_video">Lägg till bilaga (Video)</string>
   <string name="empty_trash_action">Töm papperskorg</string>
   <string name="expunge_action">Utplåna</string>
   <string name="clear_local_folder_action">Rensa lokalt lagrade meddelanden</string>
@@ -715,13 +713,7 @@ Vänligen skicka felrapporter, hjälp till med nya funktioner och ställ frågor
   <string name="font_size_medium">Stor</string>
   <string name="font_size_large">Större</string>
   <string name="font_size_larger">Störst</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Kontrollera \"Inställningar\" -&gt; \"Använd work-adound för bug i Gallery\" för att kunna bifoga bilder och filmer med Gallery 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Använd \"Lägg till bilaga (Bild)\" eller \"Lägg till bilaga (Video)\" för att bifoga bilder eller video med Gallery 3D.</string>
   <string name="miscellaneous_preferences">Diverse</string>
-  <string name="misc_preferences_attachment_title">Använd workadound för bug i Gallery</string>
-  <string name="misc_preferences_attachment_description">Visa knappar för att bifoga image/video (to work around a Gallery 3D bug)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Ingen passande applikation för denna åtgärd funnen.</string>
   <string name="error_apg_version_not_supported">Den installerade versionen av APG stöds inte.</string>

res/values-tr/strings.xml

@@ -125,8 +125,6 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="read_receipt_enabled">Okundu raporu istenecek</string>
   <string name="read_receipt_disabled">Okundu raporu istenmeyecek</string>
   <string name="add_attachment_action">Ekle</string>
-  <string name="add_attachment_action_image">Ekle (Resim)</string>
-  <string name="add_attachment_action_video">Ekle (Video)</string>
   <string name="empty_trash_action">Çöpü Boşalt</string>
   <string name="expunge_action">Silmek</string>
   <string name="clear_local_folder_action">Yerel mesajları temizle</string>
@@ -664,13 +662,7 @@ Lütfen hata raporlarınızı, istediğiniz yeni özellikleri ve sorularınızı
   <string name="font_size_medium">Orta</string>
   <string name="font_size_large">Büyük</string>
   <string name="font_size_larger">Daha büyük</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">\"Ayarlar\" -&gt; \"Galeri hata çalışması kullan\" işaretleyerek 3D Galeri kullanarak resimler veya videoları ekleyin.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">\"Ek Ekle (Resim)\" veya \"Ek Ekle (Video)\" kullanarak 3D Galeri ile resimleri ve videoları ekleyin.</string>
   <string name="miscellaneous_preferences">Çeşitli</string>
-  <string name="misc_preferences_attachment_title">Geçici çözüm galeri hatasını kullan</string>
-  <string name="misc_preferences_attachment_description">Resim/Video ekleri ekleme butonlarını göster (Bir galeri 3D hatası geçici çözümüne)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Bu eylem için uygun program bulunamadı.</string>
   <string name="error_apg_version_not_supported">Kurulu APG versiyon desteklenmiyor.</string>

res/values-uk/strings.xml

@@ -136,8 +136,6 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="read_receipt_enabled">Включити запит повідомлень про прочитання</string>
   <string name="read_receipt_disabled">Вимкнути запит повідомлень про прочитання</string>
   <string name="add_attachment_action">Додати вкладення</string>
-  <string name="add_attachment_action_image">Додати вкладення (зображення)</string>
-  <string name="add_attachment_action_video">Додати вкладення (Відео)</string>
   <string name="empty_trash_action">Очистити Кошик</string>
   <string name="expunge_action">Витерти</string>
   <string name="clear_local_folder_action">Видалити локальні повідомлення</string>
@@ -712,13 +710,7 @@ K-9 Mail це поштовий клієнт з відкритим вихідни
   <string name="font_size_medium">Середній</string>
   <string name="font_size_large">Великий</string>
   <string name="font_size_larger">Найбільший</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">Виберіть \"Налаштування\" -&gt; \"Використовувати обхід помилок Галереї\" для вкладень зображень та відео з допомогою Gallery 3D.</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">Виберіть \"Додати вкладення (зображення)\" або \"Додати вкладення (відео)\" для вкладень зображень та відео з допомогою Gallery 3D.</string>
   <string name="miscellaneous_preferences">Різне</string>
-  <string name="misc_preferences_attachment_title">Використовувати обхід помилок Галереї</string>
-  <string name="misc_preferences_attachment_description">Показувати кнопки для додавання зображень та відео вкладень (щоб обійти проблему з Gallery 3D)</string>
   <!--APG related-->
   <string name="error_activity_not_found">Відсутня програма для цієї дії.</string>
   <string name="error_apg_version_not_supported">Встановлена версія APG не підтримується.</string>

res/values-zh-rCN/strings.xml

@@ -136,8 +136,6 @@ K-9改进的功能包括：
   <string name="read_receipt_enabled">要求已读回执</string>
   <string name="read_receipt_disabled">不要求已读回执</string>
   <string name="add_attachment_action">添加附件</string>
-  <string name="add_attachment_action_image">添加图片附件</string>
-  <string name="add_attachment_action_video">添加视频附件</string>
   <string name="empty_trash_action">清空垃圾箱</string>
   <string name="expunge_action">删除</string>
   <string name="clear_local_folder_action">清空本地邮件</string>
@@ -713,13 +711,7 @@ K-9改进的功能包括：
   <string name="font_size_medium">中等</string>
   <string name="font_size_large">大</string>
   <string name="font_size_larger">更大</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">选择“设置”-&gt;“避免画册发生错误”来启用使用3D画册模式添加附件或视频。</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">利用“添加附件（图片）”或“添加附件（视频）”来使用3D画册添加图片或视频。</string>
   <string name="miscellaneous_preferences">杂项</string>
-  <string name="misc_preferences_attachment_title">避免画册发生错误</string>
-  <string name="misc_preferences_attachment_description">显示按钮来添加图片/视频附件（以避免3D画册发生错误）</string>
   <!--APG related-->
   <string name="error_activity_not_found">没有找到可以用于这一操作的程序。</string>
   <string name="error_apg_version_not_supported">不支持所安装版本的APG。</string>

res/values-zh-rTW/strings.xml

@@ -108,8 +108,6 @@
   <string name="read_receipt_enabled">要求讀取回條</string>
   <string name="read_receipt_disabled">取消讀取回條</string>
   <string name="add_attachment_action">新增附件</string>
-  <string name="add_attachment_action_image">新增圖片附件</string>
-  <string name="add_attachment_action_video">新增影片附件</string>
   <string name="empty_trash_action">清空垃圾桶</string>
   <string name="expunge_action">刪除</string>
   <string name="clear_local_folder_action">清除本地郵件</string>
@@ -685,13 +683,7 @@
   <string name="font_size_medium">中等</string>
   <string name="font_size_large">大</string>
   <string name="font_size_larger">最大</string>
-  <!--Note: Contains references to preferences_action and misc_preferences_attachment_title-->
-  <string name="message_compose_buggy_gallery">選擇「設定」-&gt;「避免相簿發生錯誤」來啟用3D相簿模式新增附件或影片。</string>
-  <!--Note: Contains references to add_attachment_action_image and add_attachment_action_video-->
-  <string name="message_compose_use_workaround">利用「新增附件（圖片）」或「新增附件（影片）」來使用3D相簿新增圖片或影片。</string>
   <string name="miscellaneous_preferences">偏好設定</string>
-  <string name="misc_preferences_attachment_title">避免相簿發生錯誤</string>
-  <string name="misc_preferences_attachment_description">顯示按鈕來新增圖片/影片為附件（以避免3D相簿發生錯誤）</string>
   <!--APG related-->
   <string name="error_activity_not_found">沒有找到可以用於此操作的程式。</string>
   <string name="error_apg_version_not_supported">尚未支援所安裝的APG版本。</string>

res/values/strings.xml

@@ -170,8 +170,6 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="read_receipt_enabled">Will request read receipt</string>
     <string name="read_receipt_disabled">Will not request read receipt</string>
     <string name="add_attachment_action">Add attachment</string>
-    <string name="add_attachment_action_image">Add attachment (Image)</string>
-    <string name="add_attachment_action_video">Add attachment (Video)</string>
     <string name="empty_trash_action">Empty Trash</string>
     <string name="expunge_action">Expunge</string>
     <string name="clear_local_folder_action">Clear local messages</string>
@@ -908,15 +906,7 @@ Please submit bug reports, contribute new features and ask questions at
     <string name="font_size_large">Large</string>
     <string name="font_size_larger">Larger</string>
 
-    <!-- Note: Contains references to preferences_action and misc_preferences_attachment_title -->
-    <string name="message_compose_buggy_gallery">Check \"Settings\" -&gt; \"Use Gallery bug work-around\" to be able to attach images or videos using Gallery 3D.</string>
-
-    <!-- Note: Contains references to add_attachment_action_image and add_attachment_action_video -->
-    <string name="message_compose_use_workaround">Use \"Add attachment (Image)\" or \"Add attachment (Video)\" to attach images or videos with Gallery 3D.</string>
-
     <string name="miscellaneous_preferences">Miscellaneous</string>
-    <string name="misc_preferences_attachment_title">Use Gallery bug work-around</string>
-    <string name="misc_preferences_attachment_description">Show buttons to add image/video attachments (to work around a Gallery 3D bug)</string>
 
     <!-- APG related -->
     <string name="error_activity_not_found">No suitable application for this action found.</string>

res/xml/global_preferences.xml

@@ -348,12 +348,6 @@
         android:title="@string/miscellaneous_preferences"
         android:key="misc_preferences">
 
-        <CheckBoxPreference
-            android:persistent="false"
-            android:key="use_gallery_bug_workaround"
-            android:title="@string/misc_preferences_attachment_title"
-            android:summary="@string/misc_preferences_attachment_description" />
-
         <Preference
             android:persistent="false"
             android:title="@string/settings_attachment_default_path"

src/com/fsck/k9/K9.java

@@ -264,9 +264,6 @@ public class K9 extends Application {
     private static boolean mHideUserAgent = false;
     private static boolean mHideTimeZone = false;
 
-    private static boolean useGalleryBugWorkaround = false;
-    private static boolean galleryBuggy;
-
     private static SortType mSortType;
     private static HashMap<SortType, Boolean> mSortAscending = new HashMap<SortType, Boolean>();
 
@@ -543,7 +540,6 @@ public class K9 extends Application {
         editor.putInt("messageViewTheme", messageViewTheme.ordinal());
         editor.putInt("messageComposeTheme", composerTheme.ordinal());
         editor.putBoolean("fixedMessageViewTheme", useFixedMessageTheme);
-        editor.putBoolean("useGalleryBugWorkaround", useGalleryBugWorkaround);
 
         editor.putBoolean("confirmDelete", mConfirmDelete);
         editor.putBoolean("confirmDeleteStarred", mConfirmDeleteStarred);
@@ -582,8 +578,6 @@ public class K9 extends Application {
         super.onCreate();
         app = this;
 
-        galleryBuggy = checkForBuggyGallery();
-
         sIsDebuggable = ((getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0);
 
         checkCachedDatabaseVersion();
@@ -749,8 +743,6 @@ public class K9 extends Application {
         mHideUserAgent = sprefs.getBoolean("hideUserAgent", false);
         mHideTimeZone = sprefs.getBoolean("hideTimeZone", false);
 
-        useGalleryBugWorkaround = sprefs.getBoolean("useGalleryBugWorkaround", K9.isGalleryBuggy());
-
         mConfirmDelete = sprefs.getBoolean("confirmDelete", false);
         mConfirmDeleteStarred = sprefs.getBoolean("confirmDeleteStarred", false);
         mConfirmSpam = sprefs.getBoolean("confirmSpam", false);
@@ -1185,18 +1177,6 @@ public class K9 extends Application {
         mHideSpecialAccounts = hideSpecialAccounts;
     }
 
-    public static boolean useGalleryBugWorkaround() {
-        return useGalleryBugWorkaround;
-    }
-
-    public static void setUseGalleryBugWorkaround(boolean useGalleryBugWorkaround) {
-        K9.useGalleryBugWorkaround = useGalleryBugWorkaround;
-    }
-
-    public static boolean isGalleryBuggy() {
-        return galleryBuggy;
-    }
-
     public static boolean confirmDelete() {
         return mConfirmDelete;
     }
@@ -1245,25 +1225,6 @@ public class K9 extends Application {
         sNotificationQuickDelete = mode;
     }
 
-    /**
-     * Check if this system contains a buggy Gallery 3D package.
-     *
-     * We have to work around the fact that those Gallery versions won't show
-     * any images or videos when the pick intent is used with a MIME type other
-     * than image/* or video/*. See issue 1186.
-     *
-     * @return true, if a buggy Gallery 3D package was found. False, otherwise.
-     */
-    private boolean checkForBuggyGallery() {
-        try {
-            PackageInfo pi = getPackageManager().getPackageInfo("com.cooliris.media", 0);
-
-            return (pi.versionCode == 30682);
-        } catch (NameNotFoundException e) {
-            return false;
-        }
-    }
-
     public static boolean wrapFolderNames() {
         return mWrapFolderNames;
     }

src/com/fsck/k9/activity/MessageCompose.java

@@ -2042,18 +2042,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
      * Kick off a picker for whatever kind of MIME types we'll accept and let Android take over.
      */
     private void onAddAttachment() {
-        if (K9.isGalleryBuggy()) {
-            if (K9.useGalleryBugWorkaround()) {
-                Toast.makeText(MessageCompose.this,
-                               getString(R.string.message_compose_use_workaround),
-                               Toast.LENGTH_LONG).show();
-            } else {
-                Toast.makeText(MessageCompose.this,
-                               getString(R.string.message_compose_buggy_gallery),
-                               Toast.LENGTH_LONG).show();
-            }
-        }
-
         onAddAttachment2("*/*");
     }
 
@@ -2549,12 +2537,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
             case R.id.add_attachment:
                 onAddAttachment();
                 break;
-            case R.id.add_attachment_image:
-                onAddAttachment2("image/*");
-                break;
-            case R.id.add_attachment_video:
-                onAddAttachment2("video/*");
-                break;
             case R.id.read_receipt:
                 onReadReceipt();
             default:
@@ -2575,13 +2557,6 @@ public class MessageCompose extends K9Activity implements OnClickListener,
             menu.findItem(R.id.save).setEnabled(false);
         }
 
-        /*
-         * Show the menu items "Add attachment (Image)" and "Add attachment (Video)"
-         * if the work-around for the Gallery bug is enabled (see Issue 1186).
-         */
-        menu.findItem(R.id.add_attachment_image).setVisible(K9.useGalleryBugWorkaround());
-        menu.findItem(R.id.add_attachment_video).setVisible(K9.useGalleryBugWorkaround());
-
         return true;
     }
 

src/com/fsck/k9/activity/setup/Prefs.java

@@ -87,7 +87,6 @@ public class Prefs extends K9PreferenceActivity {
 
     private static final String PREFERENCE_AUTOFIT_WIDTH = "messageview_autofit_width";
     private static final String PREFERENCE_BACKGROUND_OPS = "background_ops";
-    private static final String PREFERENCE_GALLERY_BUG_WORKAROUND = "use_gallery_bug_workaround";
     private static final String PREFERENCE_DEBUG_LOGGING = "debug_logging";
     private static final String PREFERENCE_SENSITIVE_LOGGING = "sensitive_logging";
 
@@ -134,7 +133,6 @@ public class Prefs extends K9PreferenceActivity {
     private CheckBoxPreference mShowNext;
     private CheckBoxPreference mAutofitWidth;
     private ListPreference mBackgroundOps;
-    private CheckBoxPreference mUseGalleryBugWorkaround;
     private CheckBoxPreference mDebugLogging;
     private CheckBoxPreference mSensitiveLogging;
     private CheckBoxPreference mHideUserAgent;
@@ -341,9 +339,6 @@ public class Prefs extends K9PreferenceActivity {
 
         mBackgroundOps = setupListPreference(PREFERENCE_BACKGROUND_OPS, K9.getBackgroundOps().name());
 
-        mUseGalleryBugWorkaround = (CheckBoxPreference)findPreference(PREFERENCE_GALLERY_BUG_WORKAROUND);
-        mUseGalleryBugWorkaround.setChecked(K9.useGalleryBugWorkaround());
-
         mDebugLogging = (CheckBoxPreference)findPreference(PREFERENCE_DEBUG_LOGGING);
         mSensitiveLogging = (CheckBoxPreference)findPreference(PREFERENCE_SENSITIVE_LOGGING);
         mHideUserAgent = (CheckBoxPreference)findPreference(PREFERENCE_HIDE_USERAGENT);
@@ -492,7 +487,6 @@ public class Prefs extends K9PreferenceActivity {
         K9.setSplitViewMode(SplitViewMode.valueOf(mSplitViewMode.getValue()));
         K9.setAttachmentDefaultPath(mAttachmentPathPreference.getSummary().toString());
         boolean needsRefresh = K9.setBackgroundOps(mBackgroundOps.getValue());
-        K9.setUseGalleryBugWorkaround(mUseGalleryBugWorkaround.isChecked());
 
         if (!K9.DEBUG && mDebugLogging.isChecked()) {
             Toast.makeText(this, R.string.debug_logging_enabled, Toast.LENGTH_LONG).show();

src/com/fsck/k9/preferences/GlobalSettings.java

@@ -188,9 +188,6 @@ public class GlobalSettings {
                 new V(16, new ThemeSetting(K9.Theme.LIGHT)),
                 new V(24, new SubThemeSetting(K9.Theme.USE_GLOBAL))
             ));
-        s.put("useGalleryBugWorkaround", Settings.versions(
-                new V(1, new GalleryBugWorkaroundSetting())
-            ));
         s.put("useVolumeKeysForListNavigation", Settings.versions(
                 new V(1, new BooleanSetting(false))
             ));
@@ -372,27 +369,6 @@ public class GlobalSettings {
         }
     }
 
-    /**
-     * The gallery bug work-around setting.
-     *
-     * <p>
-     * The default value varies depending on whether you have a version of Gallery 3D installed
-     * that contains the bug we work around.
-     * </p>
-     *
-     * @see K9#isGalleryBuggy()
-     */
-    public static class GalleryBugWorkaroundSetting extends BooleanSetting {
-        public GalleryBugWorkaroundSetting() {
-            super(false);
-        }
-
-        @Override
-        public Object getDefaultValue() {
-            return K9.isGalleryBuggy();
-        }
-    }
-
     /**
      * The language setting.
      *

src/com/fsck/k9/preferences/Settings.java

@@ -35,7 +35,7 @@ public class Settings {
      *
      * @see SettingsExporter
      */
-    public static final int VERSION = 34;
+    public static final int VERSION = 35;
 
     public static Map<String, Object> validate(int version, Map<String,
             TreeMap<Integer, SettingsDescription>> settings,