Merge cm updates

res/values-af/cm_strings.xml

@@ -48,7 +48,6 @@
   <string name="template_insert_hint">Tik die sjabloon teks hier</string>
   <string name="template_empty_text">Die teks veld kan nie leeg wees nie</string>
   <string name="template_save">Stoor</string>
-  <string name="template_ctx_menu_title">Aksies</string>
   <string name="template_edit">Verander</string>
   <string name="template_delete">Verwyder</string>
   <string name="template_list_title">Sjablone</string>
@@ -89,7 +88,6 @@
   <string name="menu_as_unread">Merk as ongelees</string>
   <string name="menu_all_as_unread">Merk alles as ongelees</string>
   <string name="confirm_mark_unread_dialog_title">Merk as ongelees?</string>
-  <string name="confirm_mark_unread_conversation">Die gesprek sal gemerk word as ongelees.</string>
   <string name="confirm_mark_unread_all_conversations">Alle drade sal gemerk word as ongelees.</string>
   <string name="select_recipients">Kies ontvangers</string>
   <string name="groups_header">Groepe</string>
@@ -117,9 +115,21 @@
   <string name="menu_insert_smiley">Voeg gesiggie by</string>
   <string name="pref_title_enable_emoticons">Emosikone ondersteuning</string>
   <string name="pref_summary_enable_emoticons">Vervang teks emosikone met grafiese ekwivalente</string>
-  <string name="normal_show">Kyk normaal modus</string>
   <string name="cannot_play">Kan nie skyfievertoning wys nie.</string>
   <string name="menu_conversation_options">Gesprek opsies</string>
   <string name="pref_title_reset_convopt_to_default">Herstel na standaard</string>
   <string name="pref_summary_reset_convopt_to_default">Herstel die gesprek instelling na die program vlak instelling</string>
+  <string name="failed_open_associated_activity_msg">Het misluk om gepaardgaande aktiwiteit te open</string>
+  <string name="cell_broadcast_sender">Sel uitsendings kanaal</string>
+  <string name="disk_storage_full_error">Fout: Stoor spasie is vol.</string>
+  <string name="system_audio_item">Stelsel klank</string>
+  <string name="external_audio_item">Eksterne klank</string>
+  <string name="pending_mms_title">Hangende MMS op ander inskrywing</string>
+  <string name="pending_mms">Boodskappe: Een of meer hangende MMS</string>
+  <string name="pending_mms_text">Raak die inskrywing om oor te skakel</string>
+  <string name="abort_mms">Boodskappe: Staak MMS</string>
+  <string name="abort_mms_text">Raak om te staak en terug te skakel</string>
+  <string name="progress_mms_title">MMS transaksie op ander inskrywing aan die gang</string>
+  <string name="progress_mms">Boodskappe: MMS aan die gang\u2026</string>
+  <string name="progress_mms_text">Raak om weer te probeer</string>
 </resources>

res/values-ar/cm_strings.xml

@@ -48,7 +48,6 @@
   <string name="template_insert_hint">أدرج نث القالب</string>
   <string name="template_empty_text">حقل نص لا يمكن أن يكون فارغاً</string>
   <string name="template_save">حفظ</string>
-  <string name="template_ctx_menu_title">الاجراءات</string>
   <string name="template_edit">تحرير</string>
   <string name="template_delete">حذف</string>
   <string name="template_list_title">قوالب</string>
@@ -89,7 +88,6 @@
   <string name="menu_as_unread">وضع علامة غير مقروء</string>
   <string name="menu_all_as_unread">ضع الكل كغير مقروءة</string>
   <string name="confirm_mark_unread_dialog_title">وضع علامة غير مقروء؟</string>
-  <string name="confirm_mark_unread_conversation">سيتم المحادثة في وضع علامة كغير مقروءة.</string>
   <string name="confirm_mark_unread_all_conversations">جميع المواضيع سيتم وضع علامة كغير مقروءة.</string>
   <string name="select_recipients">تحديد المستلمين</string>
   <string name="groups_header">المجموعات</string>
@@ -117,9 +115,9 @@
   <string name="menu_insert_smiley">إدخال وجه مبتسم</string>
   <string name="pref_title_enable_emoticons">دعم الفيسات</string>
   <string name="pref_summary_enable_emoticons">إستبدال انصه الفيسات بي المساويه لها جرافيكس</string>
-  <string name="normal_show">وضع العرض العادي</string>
   <string name="cannot_play">لا يمكن تقديم عرض الشرائح.</string>
   <string name="menu_conversation_options">خيارات المحادثة</string>
   <string name="pref_title_reset_convopt_to_default">إعادة التعيين إلى الافتراضي</string>
   <string name="pref_summary_reset_convopt_to_default">إعادة تعيين إعدادات المحادثة إلى إعداد مستوى التطبيق</string>
+  <string name="failed_open_associated_activity_msg">فشل في فتح نشاط مقترن</string>
 </resources>

res/values-ca/cm_strings.xml

@@ -48,7 +48,6 @@
   <string name="template_insert_hint">Inserta aquí la plantilla de text</string>
   <string name="template_empty_text">El camp de text no pot quedar buit</string>
   <string name="template_save">Desa</string>
-  <string name="template_ctx_menu_title">Accions</string>
   <string name="template_edit">Edita</string>
   <string name="template_delete">Esborra</string>
   <string name="template_list_title">Plantilles</string>
@@ -69,11 +68,11 @@
   <string name="pref_unicode_stripping_leave_intact">Deixa els caràcters intactes</string>
   <string name="pref_unicode_stripping_non_encodable">Esquinça els caràcters no codificables</string>
   <string name="pref_unicode_stripping_all">Esquinça tots el caràcters unicode</string>
-  <string name="pref_title_mms_full_timestamp">Data y hora completa</string>
-  <string name="pref_summary_mms_full_timestamp">Mostra la data y l\'horate and time in timestamps</string>
-  <string name="pref_title_mms_use_sent_timestamp">Data y hora original</string>
+  <string name="pref_title_mms_full_timestamp">Data i hora completa</string>
+  <string name="pref_summary_mms_full_timestamp">Mostra la data i l\'hora</string>
+  <string name="pref_title_mms_use_sent_timestamp">Data i hora original</string>
   <string name="pref_summary_mms_use_sent_timestamp">Mostra la data d\'enviament enlloc de la de recepció</string>
-  <string name="pref_title_input_type">Teclat tipus suau</string>
+  <string name="pref_title_input_type">Tipus de teclat virtual</string>
   <string name="pref_keyboard_emoji">Mostra la tecla d\'emoticones</string>
   <string name="pref_keyboard_new_line">Mostra la tecla Enter</string>
   <string name="pref_keyboard_unknown">Desconegut, si us plau reselecciona</string>
@@ -89,7 +88,6 @@
   <string name="menu_as_unread">Marca\'l com a sense llegir</string>
   <string name="menu_all_as_unread">Marcal\'s tots com sense llegir</string>
   <string name="confirm_mark_unread_dialog_title">Marcar com a sense llegir?</string>
-  <string name="confirm_mark_unread_conversation">La conversa es marcarà com a no llegida.</string>
   <string name="confirm_mark_unread_all_conversations">Tots els fils seran marcats com a no llegits.</string>
   <string name="select_recipients">Selecciona recipients</string>
   <string name="groups_header">Grups</string>
@@ -117,9 +115,21 @@
   <string name="menu_insert_smiley">Insereix una emoticona</string>
   <string name="pref_title_enable_emoticons">Suport d\'emoticones</string>
   <string name="pref_summary_enable_emoticons">Substitueix les emoticones de text amb els seus equivalents gràfics</string>
-  <string name="normal_show">Mostra el mode normal</string>
   <string name="cannot_play">No es pot mostrar la projecció de diapositives.</string>
   <string name="menu_conversation_options">Opcions de conversa</string>
   <string name="pref_title_reset_convopt_to_default">Restableix als valors per defecte</string>
   <string name="pref_summary_reset_convopt_to_default">Restableix la configuració de conversa a la configuració a nivell d\'aplicació</string>
+  <string name="failed_open_associated_activity_msg">No s\'ha pogut obrir l\'activitat associada</string>
+  <string name="cell_broadcast_sender">Canal de radiodifusió</string>
+  <string name="disk_storage_full_error">Error: L\'emmagatzematge és ple.</string>
+  <string name="system_audio_item">So del sistema</string>
+  <string name="external_audio_item">So extern</string>
+  <string name="pending_mms_title">MMS pendent en una altra subscripció</string>
+  <string name="pending_mms">Missatgeria: Un o més MMS estan pendents</string>
+  <string name="pending_mms_text">Toca per canviar la subscripció</string>
+  <string name="abort_mms">Missatgeria: Avorta MMS</string>
+  <string name="abort_mms_text">Toca per avortar i tornar enrera</string>
+  <string name="progress_mms_title">Transacció MMS en altres subscripcions en curs</string>
+  <string name="progress_mms">Missatgeria: MMS en curs\u2026</string>
+  <string name="progress_mms_text">Toca per reintentar</string>
 </resources>

res/values-cs/cm_strings.xml

@@ -48,7 +48,6 @@
   <string name="template_insert_hint">Zde vložte text šablony</string>
   <string name="template_empty_text">Textové pole nemůže být prázdné</string>
   <string name="template_save">Uložit</string>
-  <string name="template_ctx_menu_title">Akce</string>
   <string name="template_edit">Upravit</string>
   <string name="template_delete">Smazat</string>
   <string name="template_list_title">Šablony</string>
@@ -89,7 +88,6 @@
   <string name="menu_as_unread">Označit jako nepřečtené</string>
   <string name="menu_all_as_unread">Označit vše jako nepřečtené</string>
   <string name="confirm_mark_unread_dialog_title">Označit jako nepřečtené?</string>
-  <string name="confirm_mark_unread_conversation">Konverzace bude označena jako nepřečtená.</string>
   <string name="confirm_mark_unread_all_conversations">Všechny vlákna budou označena jako nepřečtená.</string>
   <string name="select_recipients">Zvolte příjemce</string>
   <string name="groups_header">Skupiny</string>
@@ -117,9 +115,21 @@
   <string name="menu_insert_smiley">Vložit smajlík</string>
   <string name="pref_title_enable_emoticons">Podpora smajlíků</string>
   <string name="pref_summary_enable_emoticons">Nahradit textovou formu smajlíků jejich obrázkovým ekvivalentem</string>
-  <string name="normal_show">Normální režim zobrazení</string>
   <string name="cannot_play">Prezentaci nelze spustit.</string>
   <string name="menu_conversation_options">Možnosti konverzace</string>
   <string name="pref_title_reset_convopt_to_default">Obnovit výchozí</string>
   <string name="pref_summary_reset_convopt_to_default">Obnovit nastavení konverzace na úroveň nastavení aplikace</string>
+  <string name="failed_open_associated_activity_msg">Selhalo otevření přidružené aktivity</string>
+  <string name="cell_broadcast_sender">Všesměrový kanál buňky</string>
+  <string name="disk_storage_full_error">Chyba: úložiště je plné.</string>
+  <string name="system_audio_item">Systémový zvuk</string>
+  <string name="external_audio_item">Externí zvuk</string>
+  <string name="pending_mms_title">Neodeslaná MMS na jiném poskytovateli</string>
+  <string name="pending_mms">Zprávy: neodesláno jedna nebo více MMS</string>
+  <string name="pending_mms_text">Dotykem přepnout poskytovatele</string>
+  <string name="abort_mms">Zprávy: zrušit MMS</string>
+  <string name="abort_mms_text">Dotykem zrušit a přepnout zpět</string>
+  <string name="progress_mms_title">Probíhá transakce MMS na jiném poskytovateli</string>
+  <string name="progress_mms">Zprávy: zpracovávání MMS\u2026</string>
+  <string name="progress_mms_text">Dotykem zkusit znovu</string>
 </resources>