Merge branch 'cm-13.0' of https://github.com/LineageOS/android_packages_apps_Messaging into replicant-6.0replicant-6.0-beta-0002replicant-6.0

11 files changed, 334 insertions, 8 deletions

diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml
index 83a8179..1384452 100644
--- a/res/values-el/cm_strings.xml
+++ b/res/values-el/cm_strings.xml
@@ -140,4 +140,5 @@
   <string name="mediapicker_audio_list_item_unselected_content_description">Ο ήχος δεν είναι επιλεγμένος.</string>
   <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> επιλεγμένα</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Αίτηση βόλτας</string>
 </resources>
diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml
index bbe2f85..cca120f 100644
--- a/res/values-es-rUS/cm_strings.xml
+++ b/res/values-es-rUS/cm_strings.xml
@@ -38,6 +38,8 @@
   <string name="pref_summary_mms_read_reports">Pedir confirmación de lectura por cada mensaje enviado</string>
   <string name="delivery_reports_mms_pref_title">Informes de entrega</string>
   <string name="read_reports_mms_pref_title">Leer informes</string>
+  <string name="status_label">Estado:\u0020</string>
+  <string name="status_read">Leído</string>
   <!-- Item Descriptions for MMS sending Priority -->
   <string name="priority_pref_title">Prioridad de envío</string>
   <string name="priority_low">Baja</string>
@@ -130,5 +132,13 @@
   <string name="slot1">SIM 1</string>
   <string name="slot2">SIM 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">Seleccione imágenes o videos en el dispositivo</string>
+  <string name="mediapicker_audioListChooserDescription">Seleccione archivos de audio en el dispositivo</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">No se puede adjuntar el vídeo. Tamaño máximo del mensaje excedido.</string>
+  <string name="mediapicker_audio_list_title">Elegir audio</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">El audio está seleccionado.</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">El audio no está seleccionado.</string>
+  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seleccionados</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Solicitar transporte</string>
 </resources>
diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml
index da03e39..ee55908 100644
--- a/res/values-es/cm_strings.xml
+++ b/res/values-es/cm_strings.xml
@@ -132,5 +132,13 @@
   <string name="slot1">SIM 1</string>
   <string name="slot2">SIM 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">Selecciona imágenes o videos de este dispositivo</string>
+  <string name="mediapicker_audioListChooserDescription">Selecciona archivos de audio de este dispositivo</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">No se puede adjuntar el vídeo. Tamaño máximo del mensaje excedido.</string>
+  <string name="mediapicker_audio_list_title">Selecciona un audio</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">El audio está seleccionado.</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">El audio no está seleccionado.</string>
+  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d </xliff:g> seleccionados</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Solicitar Transporte</string>
 </resources>
diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml
index 98c49c1..2d771f4 100644
--- a/res/values-ja/cm_strings.xml
+++ b/res/values-ja/cm_strings.xml
@@ -74,7 +74,7 @@
   <!-- Hint text in message body field when keyboard is exposed -->
   <string name="type_to_reply_text_enter_to_send">返信の種類</string>
   <!-- QM Toast -->
-  <string name="toast_sending_message">メッセージを送信中\u2026</string>
+  <string name="toast_sending_message">メッセージを送信中...</string>
   <!-- QM - Quick reply -->
   <string name="qm_quick_reply">クイック返信</string>
   <string name="send">送信</string>
@@ -111,7 +111,7 @@
   <!-- Title of screen displaying messages on SIM card -->
   <string name="sim_manage_messages_title">SIMカードのテキストメッセージ</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
-  <string name="refreshing">更新中\u2026</string>
+  <string name="refreshing">更新中...</string>
   <string name="confirm_delete_selected_messages">選択したメッセージは削除されます。</string>
   <!-- Delete button title -->
   <string name="delete">削除</string>
diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml
index 381b3bc..dbe1ac9 100644
--- a/res/values-pl/cm_strings.xml
+++ b/res/values-pl/cm_strings.xml
@@ -120,6 +120,7 @@
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
   <string name="sim_copy_to_phone_memory" product="default">Kopiuj do pamięci telefonu</string>
   <string name="selected_all">Wybierz wszystkie</string>
+  <string name="deselected_all">Odznacz wszystko</string>
   <string name="selected_count"><xliff:g id="COUNT">%d </xliff:g> wybrano</string>
   <!-- Text to be used for affirmative response button in dialog boxes -->
   <string name="yes">OK</string>
diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml
index c5ed1fd..2febbb1 100644
--- a/res/values-ro/cm_strings.xml
+++ b/res/values-ro/cm_strings.xml
@@ -23,16 +23,41 @@
   <string name="pref_unicode_stripping_non_encodable">Elimină caracterele ne-codificabile</string>
   <string name="pref_unicode_stripping_all">Elimină toate caracterele unicod</string>
   <!-- Settings item description for SMS and MMS Validity period -->
+  <string name="validity_period_pref_title">Perioada de valabilitate</string>
+  <string name="validity_period_slot1_pref_title">Perioada de valabilitate pentru SIM 1</string>
+  <string name="validity_period_slot2_pref_title">Perioada de valabilitate pentru SIM 2</string>
+  <string name="sms_validity_period_not_set">Nesetată</string>
   <string name="sms_validity_period_one_hour">1 oră</string>
   <string name="sms_validity_period_six_hours">6 ore</string>
   <string name="sms_validity_period_twelve_hours">12 ore</string>
   <string name="sms_validity_period_one_day">1 zi</string>
   <string name="mms_validity_period_two_days">2 zile</string>
   <string name="mms_validity_period_one_week">1 săptămână</string>
+  <string name="validity_period_maximum">Maximum</string>
+  <string name="pref_summary_mms_delivery_reports">Cereți o confirmare de livrare pentru fiecare mesaj trimis</string>
+  <string name="pref_summary_mms_read_reports">Cereți o confirmare de citire pentru fiecare mesaj trimis</string>
+  <string name="delivery_reports_mms_pref_title">Rapoarte de livrare</string>
+  <string name="read_reports_mms_pref_title">Citiți rapoartele</string>
+  <string name="status_label">Status:\u0020</string>
+  <string name="status_read">Citit</string>
   <!-- Item Descriptions for MMS sending Priority -->
+  <string name="priority_pref_title">Prioritate trimitere</string>
+  <string name="priority_low">Redusă</string>
+  <string name="priority_normal">Normală</string>
+  <string name="priority_high">Ridicată</string>
   <!-- Storage specific Settings -->
+  <string name="sms_storage_pref_title">Stocare</string>
+  <string name="pref_summary_auto_delete">Ştergeți mesajele vechi când sunt atinse limitele</string>
+  <string name="auto_delete_pref_title">Ștergeți mesajele vechi</string>
+  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> mesaje per conversație</string>
+  <string name="sms_delete_pref_title">Limită mesaj text</string>
+  <string name="mms_delete_pref_title">Limită mesaj multimedia</string>
+  <string name="set">Setați</string>
+  <string name="no">Revocați</string>
+  <string name="pref_messages_to_save">Setaţi numărul de mesaje pentru a fi salvate</string>
   <!-- Swipe to delete conversation -->
   <string name="swipe_to_delete_conversation_pref_title">Glisare pentru a șterge</string>
+  <string name="swipe_to_delete_conversation_pref_summary">Glisați spre dreapta pentru a şterge o conversație</string>
   <!-- QUICKMESSAGE SUPPORT -->
   <!-- Preferences -->
   <string name="pref_quickmessage">Mesaj Rapid și Răspuns</string>
@@ -55,25 +80,65 @@
   <string name="send">Trimite</string>
   <string name="compose_message_hint_text">Introduceți mesajul</string>
   <!-- Show emoticons -->
+  <string name="show_emoticons_pref_title">Acces emoticoane</string>
+  <string name="show_emoticons_pref_summary">Arată emoticoane pe tastatură</string>
   <string name="select_phone_account_title">Trimiteți cu</string>
   <!-- Copy message to sim -->
   <!-- Settings item for entering SIM card message screen -->
+  <string name="pref_title_manage_sim_messages">Gestionați mesajele de pe cartela SIM</string>
+  <string name="pref_title_manage_sim_messages_slot1">Gestionați mesajele de pe SIM 1</string>
+  <string name="pref_title_manage_sim_messages_slot2">Gestionați mesajele de pe SIM 2</string>
+  <string name="copy_to_sim">Copiați mesajul pe cartela SIM</string>
+  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> din <xliff:g id="total">%2$d</xliff:g> (de) mesaje salvate pe cartela SIM.</string>
+  <string name="copy_to_sim_fail">Imposibil de salvat mesajul</string>
+  <string name="copy_to_phone_success">Mesaj salvat</string>
+  <string name="copy_to_phone_fail">Imposibil de salvat mesajul</string>
   <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
+  <string name="sim_empty">Nu există mesaje pe cartela SIM.</string>
   <!-- Context menu item on an individual message for emailing the sender -->
+  <string name="menu_send_email">Trimiteți e-mail către <xliff:g id="name">%s</xliff:g></string>
   <!-- Context menu item on an individual message for dialing the sender's phone number -->
+  <string name="menu_call_back">Apelați <xliff:g id="name">%s</xliff:g></string>
   <!-- Menu shown in the context menu when long pressing on a message when the message contains
          one or more phone numbers and/or email addresses and the number or email is new to
          contacts. [CHAR LIMIT=50] -->
+  <string name="menu_add_address_to_contacts">Adăugați <xliff:g id="contactEmailOrNumber">%s</xliff:g> la Persoane</string>
+  <string name="sim_capacity_title">Capacitate SIM</string>
+  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> din <xliff:g id="total">%2$d</xliff:g> intrări de pe cartela SIM sunt utilizate</string>
   <!-- Confirm Delete -->
   <!-- Delete confirmation dialog title -->
+  <string name="confirm_dialog_title">Ștergeți?</string>
   <!-- Title of screen displaying messages on SIM card -->
+  <string name="sim_manage_messages_title">Mesaje text pe cartela SIM</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
+  <string name="refreshing">Actualizare\u2026</string>
+  <string name="confirm_delete_selected_messages">Mesajul selectat va fi şters.</string>
   <!-- Delete button title -->
+  <string name="delete">Ștergeți</string>
   <!-- Context menu item on an individual message for forwarding it to another recipient -->
+  <string name="menu_forward">Redirecţionaţi</string>
+  <string name="menu_reply">Răspundeți</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="tablet">Copiați în memoria tabletei</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="default">Copiați în memoria telefonului</string>
+  <string name="selected_all">Selectați tot</string>
+  <string name="deselected_all">Deselectați tot</string>
+  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> selectate</string>
   <!-- Text to be used for affirmative response button in dialog boxes -->
+  <string name="yes">OK</string>
   <!-- Copy message to sim -->
+  <string name="operation_to_card_memory">Copiați mesajul pe cartela SIM</string>
+  <string name="slot1">SIM 1</string>
+  <string name="slot2">SIM 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">Alegeți imagini sau videoclipuri de pe acest dispozitiv</string>
+  <string name="mediapicker_audioListChooserDescription">Alegeți fişiere audio de pe acest dispozitiv</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">Nu se poate atașa videoclipul. Dimensiunea maximă a mesajului a fost depășită.</string>
+  <string name="mediapicker_audio_list_title">Alegeți fișierul audio</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">Fișierul audio este selectat.</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">Fișierul audio nu este selectat.</string>
+  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> selectate</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Solicitați Cursă</string>
 </resources>
diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml
index bfd7b4d..c18162b 100644
--- a/res/values-sk/cm_strings.xml
+++ b/res/values-sk/cm_strings.xml
@@ -16,12 +16,48 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="report_as_spam_to">Nahlásiť ako spam do %s</string>
   <!-- Strip unicode -->
+  <string name="unicode_stripping_pref_title">Odstrániť znaky Unicode</string>
+  <string name="pref_unicode_stripping_leave_intact">Ponechať znaky bezo zmeny</string>
   <string name="pref_unicode_stripping_non_encodable">Odstrániť nekódovateľné znaky</string>
+  <string name="pref_unicode_stripping_all">Odstrániť všetky znaky Unicode</string>
   <!-- Settings item description for SMS and MMS Validity period -->
+  <string name="validity_period_pref_title">Doba platnosti</string>
+  <string name="validity_period_slot1_pref_title">Doba platnosti pre SIM 1</string>
+  <string name="validity_period_slot2_pref_title">Doba platnosti pre SIM 2</string>
+  <string name="sms_validity_period_not_set">Nenastavené</string>
+  <string name="sms_validity_period_one_hour">1 hodina</string>
+  <string name="sms_validity_period_six_hours">6 hodín</string>
+  <string name="sms_validity_period_twelve_hours">12 hodín</string>
+  <string name="sms_validity_period_one_day">1 deň</string>
+  <string name="mms_validity_period_two_days">2 dni</string>
+  <string name="mms_validity_period_one_week">1 týždeň</string>
+  <string name="validity_period_maximum">Maximálna</string>
+  <string name="pref_summary_mms_delivery_reports">Pre každú odoslanú právu vyžiadaj správu o doručení</string>
+  <string name="pref_summary_mms_read_reports">Pre každú odoslanú právu vyžiadaj správu o prečítaní</string>
+  <string name="delivery_reports_mms_pref_title">Správy o doručení</string>
+  <string name="read_reports_mms_pref_title">Správy o prečítaní</string>
+  <string name="status_label">Stav:\u0020</string>
+  <string name="status_read">Prečítané</string>
   <!-- Item Descriptions for MMS sending Priority -->
+  <string name="priority_pref_title">Priorita posielania</string>
+  <string name="priority_low">Nízka</string>
+  <string name="priority_normal">Normálna</string>
+  <string name="priority_high">Vysoká</string>
   <!-- Storage specific Settings -->
+  <string name="sms_storage_pref_title">Úložisko</string>
+  <string name="pref_summary_auto_delete">Vymazať staré správy pri dosiahnutí limitu</string>
+  <string name="auto_delete_pref_title">Vymazať staré správy</string>
+  <string name="pref_summary_delete_limit"><xliff:g id="count">%1$s</xliff:g> správ v konverzácii</string>
+  <string name="sms_delete_pref_title">Limit pre textové správy</string>
+  <string name="mms_delete_pref_title">Limit pre multimediálne správy</string>
+  <string name="set">Nastaviť</string>
+  <string name="no">Zrušiť</string>
+  <string name="pref_messages_to_save">Nastavte počet správ na uloženie</string>
   <!-- Swipe to delete conversation -->
+  <string name="swipe_to_delete_conversation_pref_title">Potiahnutím zmazať</string>
+  <string name="swipe_to_delete_conversation_pref_summary">Potiahnutím vpravo zmazať konverzáciu</string>
   <!-- QUICKMESSAGE SUPPORT -->
   <!-- Preferences -->
   <string name="pref_quickmessage">Rýchla správa a odpoveď</string>
@@ -34,30 +70,75 @@
   <string name="button_close">Zavrieť</string>
   <string name="button_view">Zobraziť</string>
   <string name="button_templates">Šablóny</string>
+  <string name="qm_button_full_conversation">Celá konverzácia</string>
   <!-- Hint text in message body field when keyboard is exposed -->
   <string name="type_to_reply_text_enter_to_send">Zadajte odpoveď</string>
   <!-- QM Toast -->
   <string name="toast_sending_message">Odosielanie správy</string>
   <!-- QM - Quick reply -->
+  <string name="qm_quick_reply">Rýchla odpoveď</string>
+  <string name="send">Odoslať</string>
+  <string name="compose_message_hint_text">Zadajte správu</string>
   <!-- Show emoticons -->
+  <string name="show_emoticons_pref_title">Zobrazenie smajlíkov</string>
+  <string name="show_emoticons_pref_summary">Klávesu pre zobrazenie smajlíkov zobrazovať na klávesnici</string>
+  <string name="select_phone_account_title">Poslať cez</string>
   <!-- Copy message to sim -->
   <!-- Settings item for entering SIM card message screen -->
+  <string name="pref_title_manage_sim_messages">Spravovať správy na karte SIM</string>
+  <string name="pref_title_manage_sim_messages_slot1">Spravovať správy na karte SIM 1</string>
+  <string name="pref_title_manage_sim_messages_slot2">Spravovať správy na karte SIM 2</string>
+  <string name="copy_to_sim">Kopírovať správu na kartu SIM</string>
+  <string name="copy_to_sim_success">Počet uložených správ na SIM karte: <xliff:g id="count">%1$d</xliff:g> z <xliff:g id="total">%2$d</xliff:g>.</string>
+  <string name="copy_to_sim_fail">Nepodarilo sa uložiť správu</string>
+  <string name="copy_to_phone_success">Správa bola uložená</string>
+  <string name="copy_to_phone_fail">Nepodarilo sa uložiť správu</string>
   <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
+  <string name="sim_empty">Žiadne správy na SIM karte.</string>
   <!-- Context menu item on an individual message for emailing the sender -->
+  <string name="menu_send_email">Poslať e-mail na <xliff:g id="name">%s </xliff:g></string>
   <!-- Context menu item on an individual message for dialing the sender's phone number -->
+  <string name="menu_call_back">Zavolať <xliff:g id="name">%s</xliff:g></string>
   <!-- Menu shown in the context menu when long pressing on a message when the message contains
          one or more phone numbers and/or email addresses and the number or email is new to
          contacts. [CHAR LIMIT=50] -->
+  <string name="menu_add_address_to_contacts">Pridať <xliff:g id="contactEmailOrNumber">%s</xliff:g> do kontaktov</string>
+  <string name="sim_capacity_title">Kapacita SIM karty</string>
+  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> z<xliff:g id="total">%2$d</xliff:g> položiek karty SIM je využitých</string>
   <!-- Confirm Delete -->
   <!-- Delete confirmation dialog title -->
+  <string name="confirm_dialog_title">Vymazať?</string>
   <!-- Title of screen displaying messages on SIM card -->
+  <string name="sim_manage_messages_title">Textové správy na SIM karte</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
+  <string name="refreshing">Obnovenie\u2026</string>
+  <string name="confirm_delete_selected_messages">Vybrané správy budú odstránené.</string>
   <!-- Delete button title -->
+  <string name="delete">Vymazať</string>
   <!-- Context menu item on an individual message for forwarding it to another recipient -->
+  <string name="menu_forward">Preposlať</string>
+  <string name="menu_reply">Odpovedať</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="tablet">Kopírovať do pamäte tabletu</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="default">Kopírovať do pamäte telefónu</string>
+  <string name="selected_all">Vybrať všetko</string>
+  <string name="deselected_all">Zrušiť výber všetkých</string>
+  <string name="selected_count">Počet vybraných: <xliff:g id="COUNT">%d</xliff:g></string>
   <!-- Text to be used for affirmative response button in dialog boxes -->
+  <string name="yes">OK</string>
   <!-- Copy message to sim -->
+  <string name="operation_to_card_memory">Kopírovať správu na kartu SIM</string>
+  <string name="slot1">SIM 1</string>
+  <string name="slot2">SIM 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">Vyberte obrázky alebo videá z tohto zariadenia</string>
+  <string name="mediapicker_audioListChooserDescription">Vyberte audio súbory z tohto zariadenia</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">Video sa nedá pripojiť. Prekročená maximálna veľkosť správy.</string>
+  <string name="mediapicker_audio_list_title">Vybrať zvuk</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">Je vybraný zvuk.</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">Zvuk nie je vybraný.</string>
+  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> vybraný</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Požiadať o jazdu</string>
 </resources>
diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml
index 9efca42..eab6724 100644
--- a/res/values-tr/cm_strings.xml
+++ b/res/values-tr/cm_strings.xml
@@ -38,6 +38,8 @@
   <string name="pref_summary_mms_read_reports">Gönderdiğiniz her ileti için bir teslim raporu isteyin</string>
   <string name="delivery_reports_mms_pref_title">Teslim raporları</string>
   <string name="read_reports_mms_pref_title">Okundu raporları</string>
+  <string name="status_label">Durum:\u0020</string>
+  <string name="status_read">Oku</string>
   <!-- Item Descriptions for MMS sending Priority -->
   <string name="priority_pref_title">Gönderim önceliği</string>
   <string name="priority_low">Düşük</string>
@@ -83,22 +85,60 @@
   <string name="select_phone_account_title">Şununla gönder</string>
   <!-- Copy message to sim -->
   <!-- Settings item for entering SIM card message screen -->
+  <string name="pref_title_manage_sim_messages">SIM mesajlarını yönet</string>
+  <string name="pref_title_manage_sim_messages_slot1">SIM 1 mesajlarını yönet</string>
+  <string name="pref_title_manage_sim_messages_slot2">SIM 2 mesajlarını yönet</string>
+  <string name="copy_to_sim">Mesajı SIM karta kopyala</string>
+  <string name="copy_to_sim_success"><xliff:g id="count">%1$d </xliff:g> <xliff:g id="total">%2$d </xliff:g> mesajları SIM kartına kaydedilir.</string>
+  <string name="copy_to_sim_fail">Mesaj kaydedilemedi</string>
+  <string name="copy_to_phone_success">Mesaj kaydedildi</string>
+  <string name="copy_to_phone_fail">Mesaj kaydedilemedi</string>
   <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
+  <string name="sim_empty">SIM kartta mesaj yok.</string>
   <!-- Context menu item on an individual message for emailing the sender -->
+  <string name="menu_send_email">Şuraya email gönder: <xliff:g id="name">%s</xliff:g></string>
   <!-- Context menu item on an individual message for dialing the sender's phone number -->
+  <string name="menu_call_back">Sesli arama yap: <xliff:g id="Name">%s</xliff:g></string>
   <!-- Menu shown in the context menu when long pressing on a message when the message contains
          one or more phone numbers and/or email addresses and the number or email is new to
          contacts. [CHAR LIMIT=50] -->
+  <string name="menu_add_address_to_contacts"><xliff:g id="contactEmailOrNumber">%s </xliff:g> kişilere ekle</string>
+  <string name="sim_capacity_title">SIM kapasitesi</string>
+  <string name="sim_capacity"><xliff:g id="used">%1$d </xliff:g>-<xliff:g id="total">%2$d </xliff:g> SIM kart girişleri kullanılır</string>
   <!-- Confirm Delete -->
   <!-- Delete confirmation dialog title -->
+  <string name="confirm_dialog_title">Sil?</string>
   <!-- Title of screen displaying messages on SIM card -->
+  <string name="sim_manage_messages_title">SIM karttaki mesajlar</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
+  <string name="refreshing">Yenileniyor\u2026</string>
+  <string name="confirm_delete_selected_messages">Seçilen mesaj silinecek.</string>
   <!-- Delete button title -->
+  <string name="delete">Sil</string>
   <!-- Context menu item on an individual message for forwarding it to another recipient -->
+  <string name="menu_forward">Yönlendir</string>
+  <string name="menu_reply">Yanıtla</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="tablet">Tablet hafızasına kopyala</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="default">Telefon hafızasına kopyalayın</string>
+  <string name="selected_all">Tümünü seç</string>
+  <string name="deselected_all">Tüm seçilenleri kaldır</string>
+  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> öge seçildi</string>
   <!-- Text to be used for affirmative response button in dialog boxes -->
+  <string name="yes">TAMAM</string>
   <!-- Copy message to sim -->
+  <string name="operation_to_card_memory">Mesajı SIM karta kopyala</string>
+  <string name="slot1">SIM 1</string>
+  <string name="slot2">SIM 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">Bu cihazdan resim veya video seç</string>
+  <string name="mediapicker_audioListChooserDescription">Bu cihazdan ses dosyası seçin</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">Video eklenemiyor. En büyük ileti boyutu aşıldı.</string>
+  <string name="mediapicker_audio_list_title">Ses seçin</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">Ses seçildi.</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">Ses seçilmedi.</string>
+  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> seçildi</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Araç isteği</string>
 </resources>
diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml
index bd4a2b2..77d0a35 100644
--- a/res/values-vi/cm_strings.xml
+++ b/res/values-vi/cm_strings.xml
@@ -38,6 +38,8 @@
   <string name="pref_summary_mms_read_reports">Yêu cầu báo cáo đọc cho mỗi tin nhắn bạn gửi</string>
   <string name="delivery_reports_mms_pref_title">Thông báo gửi</string>
   <string name="read_reports_mms_pref_title">Báo cáo đọc</string>
+  <string name="status_label">Trạng thái:\u0020</string>
+  <string name="status_read">Đọc</string>
   <!-- Item Descriptions for MMS sending Priority -->
   <string name="priority_pref_title">Ưu tiên gửi</string>
   <string name="priority_low">Thấp</string>
@@ -83,22 +85,60 @@
   <string name="select_phone_account_title">Gửi bằng</string>
   <!-- Copy message to sim -->
   <!-- Settings item for entering SIM card message screen -->
+  <string name="pref_title_manage_sim_messages">Quản lý tin nhắn thẻ SIM</string>
+  <string name="pref_title_manage_sim_messages_slot1">Quản lý tin nhắn SIM 1</string>
+  <string name="pref_title_manage_sim_messages_slot2">Quản lý tin nhắn SIM 2</string>
+  <string name="copy_to_sim">Sao chép tin nhắn vào thẻ SIM</string>
+  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> trong số <xliff:g id="total">%2$d</xliff:g> tin nhắn đã lưu vào thẻ SIM.</string>
+  <string name="copy_to_sim_fail">Không thể lưu tin nhắn</string>
+  <string name="copy_to_phone_success">Tin nhắn đã lưu</string>
+  <string name="copy_to_phone_fail">Không thể lưu tin nhắn</string>
   <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
+  <string name="sim_empty">Không có tin nhắn trên thẻ SIM.</string>
   <!-- Context menu item on an individual message for emailing the sender -->
+  <string name="menu_send_email">Gửi email đến <xliff:g id="name">%s</xliff:g></string>
   <!-- Context menu item on an individual message for dialing the sender's phone number -->
+  <string name="menu_call_back">Gọi <xliff:g id="name">%s</xliff:g></string>
   <!-- Menu shown in the context menu when long pressing on a message when the message contains
          one or more phone numbers and/or email addresses and the number or email is new to
          contacts. [CHAR LIMIT=50] -->
+  <string name="menu_add_address_to_contacts">Thêm <xliff:g id="contactEmailOrNumber">%s</xliff:g> vào Liên hệ</string>
+  <string name="sim_capacity_title">Bộ nhớ SIM</string>
+  <string name="sim_capacity"><xliff:g id="used">%1$d</xliff:g> trong số <xliff:g id="total">%2$d</xliff:g> mục trên thẻ SIM hiện được sử dụng</string>
   <!-- Confirm Delete -->
   <!-- Delete confirmation dialog title -->
+  <string name="confirm_dialog_title">Xóa?</string>
   <!-- Title of screen displaying messages on SIM card -->
+  <string name="sim_manage_messages_title">Tin nhắn văn bản trên thẻ SIM</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
+  <string name="refreshing">Đang làm mới\u2026</string>
+  <string name="confirm_delete_selected_messages">Tin nhắn đã chọn sẽ bị xóa.</string>
   <!-- Delete button title -->
+  <string name="delete">Xóa</string>
   <!-- Context menu item on an individual message for forwarding it to another recipient -->
+  <string name="menu_forward">Chuyển tiếp</string>
+  <string name="menu_reply">Trả lời</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="tablet">Sao chép vào bộ nhớ máy tính bảng</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="default">Sao chép vào bộ nhớ điện thoại</string>
+  <string name="selected_all">Chọn tất cả</string>
+  <string name="deselected_all">Bỏ chọn tất cả</string>
+  <string name="selected_count"><xliff:g id="COUNT">%d</xliff:g> đã chọn</string>
   <!-- Text to be used for affirmative response button in dialog boxes -->
+  <string name="yes">OK</string>
   <!-- Copy message to sim -->
+  <string name="operation_to_card_memory">Sao chép tin nhắn vào thẻ SIM</string>
+  <string name="slot1">SIM 1</string>
+  <string name="slot2">SIM 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">Chọn hình ảnh hoặc video từ thiết bị này</string>
+  <string name="mediapicker_audioListChooserDescription">Chọn tập tin âm thanh từ thiết bị này</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">Không thể đính kèm video. Đã vượt quá kích thước thư tối đa.</string>
+  <string name="mediapicker_audio_list_title">Chọn âm thanh</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">Âm thanh được chọn.</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">Âm thanh không được chọn.</string>
+  <string name="mediapicker_audio_list_title_selection"><xliff:g id="count">%d</xliff:g> đã chọn</string>
   <!-- Ride sharing -->
+  <string name="request_ride">Yêu cầu đi xe</string>
 </resources>
diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml
index c5537f1..17cd88a 100644
--- a/res/values-zh-rCN/cm_strings.xml
+++ b/res/values-zh-rCN/cm_strings.xml
@@ -89,7 +89,7 @@
   <string name="pref_title_manage_sim_messages_slot1">管理 SIM 卡 1 的信息</string>
   <string name="pref_title_manage_sim_messages_slot2">管理 SIM 卡 2 的信息</string>
   <string name="copy_to_sim">将信息复制到 SIM 卡</string>
-  <string name="copy_to_sim_success"><xliff:g id="total">%2$d </xliff:g> 条中的 <xliff:g id="count">%1$d </xliff:g> 条信息已保存到 SIM 卡。</string>
+  <string name="copy_to_sim_success"><xliff:g id="count">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> 条信息已保存到 SIM 卡。</string>
   <string name="copy_to_sim_fail">无法保存信息</string>
   <string name="copy_to_phone_success">信息已保存</string>
   <string name="copy_to_phone_fail">无法保存信息</string>
@@ -102,12 +102,12 @@
   <!-- Menu shown in the context menu when long pressing on a message when the message contains
          one or more phone numbers and/or email addresses and the number or email is new to
          contacts. [CHAR LIMIT=50] -->
-  <string name="menu_add_address_to_contacts">将 <xliff:g id="contactEmailOrNumber">%s </xliff:g> 添加到联系人</string>
+  <string name="menu_add_address_to_contacts">将 <xliff:g id="contactEmailOrNumber">%s</xliff:g> 添加到联系人</string>
   <string name="sim_capacity_title">SIM 卡容量</string>
-  <string name="sim_capacity">已使用 SIM 卡容量 <xliff:g id="total">%2$d</xliff:g> 条中的 <xliff:g id="used">%1$d</xliff:g> 条</string>
+  <string name="sim_capacity">SIM 卡容量已使用 <xliff:g id="used">%1$d</xliff:g> / <xliff:g id="total">%2$d</xliff:g> 项</string>
   <!-- Confirm Delete -->
   <!-- Delete confirmation dialog title -->
-  <string name="confirm_dialog_title">确定删除?</string>
+  <string name="confirm_dialog_title">确定删除？</string>
   <!-- Title of screen displaying messages on SIM card -->
   <string name="sim_manage_messages_title">SIM 卡中的信息</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml
index c4f5b1c..d89140f 100644
--- a/res/values-zh-rTW/cm_strings.xml
+++ b/res/values-zh-rTW/cm_strings.xml
@@ -16,49 +16,129 @@
     limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+  <string name="report_as_spam_to">報告為垃圾郵件至 %s</string>
   <!-- Strip unicode -->
+  <string name="unicode_stripping_pref_title">去除 unicode</string>
   <string name="pref_unicode_stripping_leave_intact">保留完整字元</string>
+  <string name="pref_unicode_stripping_non_encodable">去除不可編碼的字元</string>
   <string name="pref_unicode_stripping_all">去除所有 Unicode 字元</string>
   <!-- Settings item description for SMS and MMS Validity period -->
+  <string name="validity_period_pref_title">有效期</string>
+  <string name="validity_period_slot1_pref_title">SIM 卡 1 的有效期</string>
+  <string name="validity_period_slot2_pref_title">SIM 卡 2 的有效期</string>
+  <string name="sms_validity_period_not_set">未設定</string>
+  <string name="sms_validity_period_one_hour">1小時</string>
+  <string name="sms_validity_period_six_hours">6 小時</string>
+  <string name="sms_validity_period_twelve_hours">12 小時</string>
+  <string name="sms_validity_period_one_day">1 天</string>
+  <string name="mms_validity_period_two_days">2 天</string>
+  <string name="mms_validity_period_one_week">1 週</string>
+  <string name="validity_period_maximum">最大值</string>
+  <string name="pref_summary_mms_delivery_reports">為每則傳送的訊息請求送達報告</string>
+  <string name="pref_summary_mms_read_reports">為每則傳送的訊息請求讀取報告</string>
+  <string name="delivery_reports_mms_pref_title">傳送報告</string>
+  <string name="read_reports_mms_pref_title">讀取報告</string>
+  <string name="status_label">狀態：\u0020</string>
+  <string name="status_read">已讀</string>
   <!-- Item Descriptions for MMS sending Priority -->
+  <string name="priority_pref_title">傳送優先權</string>
+  <string name="priority_low">低</string>
+  <string name="priority_normal">一般</string>
+  <string name="priority_high">高</string>
   <!-- Storage specific Settings -->
+  <string name="sms_storage_pref_title">儲存空間</string>
+  <string name="pref_summary_auto_delete">當達到限制時刪除舊訊息</string>
+  <string name="auto_delete_pref_title">删除舊訊息</string>
+  <string name="pref_summary_delete_limit">每個對話 <xliff:g id="count">%1$s</xliff:g> 則訊息</string>
+  <string name="sms_delete_pref_title">文字訊息限制</string>
+  <string name="mms_delete_pref_title">多媒體訊息限制</string>
+  <string name="set">設定</string>
+  <string name="no">取消</string>
+  <string name="pref_messages_to_save">設定要儲存的訊息數量</string>
   <!-- Swipe to delete conversation -->
+  <string name="swipe_to_delete_conversation_pref_title">滑動刪除</string>
+  <string name="swipe_to_delete_conversation_pref_summary">向右滑動即可刪除對話</string>
   <!-- QUICKMESSAGE SUPPORT -->
   <!-- Preferences -->
   <string name="pref_quickmessage">快速訊息和回覆</string>
   <string name="pref_quickmessage_title">顯示快速訊息</string>
-  <string name="pref_quickmessage_summary">將傳入的簡訊自動彈出快速訊息視窗</string>
+  <string name="pref_quickmessage_summary">將接收的簡訊訊息自動彈出快速訊息視窗</string>
   <string name="pref_close_all_title">全部關閉</string>
-  <string name="pref_close_all_summary">關閉按鈕會關閉所有訊息</string>
+  <string name="pref_close_all_summary">關閉按鍵會關閉所有訊息</string>
   <string name="message_counter">%2$d 的 %1$d</string>
   <!-- QM Dialog box buttons -->
   <string name="button_close">關閉</string>
   <string name="button_view">檢視</string>
   <string name="button_templates">範本</string>
+  <string name="qm_button_full_conversation">完整的對話</string>
   <!-- Hint text in message body field when keyboard is exposed -->
   <string name="type_to_reply_text_enter_to_send">輸入即可回覆</string>
   <!-- QM Toast -->
   <string name="toast_sending_message">正在傳送訊息\u2026</string>
   <!-- QM - Quick reply -->
+  <string name="qm_quick_reply">快速回覆</string>
+  <string name="send">傳送</string>
+  <string name="compose_message_hint_text">輸入訊息</string>
   <!-- Show emoticons -->
+  <string name="show_emoticons_pref_title">表情符號使用</string>
+  <string name="show_emoticons_pref_summary">在鍵盤上顯示表情符號按鍵</string>
+  <string name="select_phone_account_title">傳送方式</string>
   <!-- Copy message to sim -->
   <!-- Settings item for entering SIM card message screen -->
+  <string name="pref_title_manage_sim_messages">管理 SIM 卡的訊息</string>
+  <string name="pref_title_manage_sim_messages_slot1">管理 SIM 卡 1 的訊息</string>
+  <string name="pref_title_manage_sim_messages_slot2">管理 SIM 卡 2 的訊息</string>
+  <string name="copy_to_sim">複製訊息至 SIM 卡</string>
+  <string name="copy_to_sim_success"><xliff:g id="total">%2$d</xliff:g> 則中的 <xliff:g id="count">%1$d</xliff:g> 則訊息已儲存至 SIM 卡。</string>
+  <string name="copy_to_sim_fail">無法儲存訊息</string>
+  <string name="copy_to_phone_success">訊息已儲存</string>
+  <string name="copy_to_phone_fail">無法儲存訊息</string>
   <!-- Message that appears on the "SMS messges on SIM card" screen when there are no messages on the SIM card -->
+  <string name="sim_empty">SIM 卡裡沒有訊息</string>
   <!-- Context menu item on an individual message for emailing the sender -->
+  <string name="menu_send_email">傳送電子郵件至<xliff:g id="number">%s</xliff:g></string>
   <!-- Context menu item on an individual message for dialing the sender's phone number -->
+  <string name="menu_call_back">打給<xliff:g id="name">%s</xliff:g></string>
   <!-- Menu shown in the context menu when long pressing on a message when the message contains
          one or more phone numbers and/or email addresses and the number or email is new to
          contacts. [CHAR LIMIT=50] -->
+  <string name="menu_add_address_to_contacts">將 <xliff:g id="contactEmailOrNumber">%s </xliff:g> 新增至聯絡人</string>
+  <string name="sim_capacity_title">SIM 卡容量</string>
+  <string name="sim_capacity">已使用 SIM 卡總容量 <xliff:g id="total">%2$d</xliff:g> 中的 <xliff:g id="used">%1$d</xliff:g></string>
   <!-- Confirm Delete -->
   <!-- Delete confirmation dialog title -->
+  <string name="confirm_dialog_title">刪除？</string>
   <!-- Title of screen displaying messages on SIM card -->
+  <string name="sim_manage_messages_title">SIM 卡上的訊息</string>
   <!-- Message that appears on screen while SIM card messages are retrieved -->
+  <string name="refreshing">重新整理中\u2026</string>
+  <string name="confirm_delete_selected_messages">已選取的訊息將被刪除。</string>
   <!-- Delete button title -->
+  <string name="delete">刪除</string>
   <!-- Context menu item on an individual message for forwarding it to another recipient -->
+  <string name="menu_forward">轉寄</string>
+  <string name="menu_reply">回覆</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="tablet">複製到平板電腦記憶體</string>
   <!-- Menu title to copy a selected message from the SIM card to the phone. -->
+  <string name="sim_copy_to_phone_memory" product="default">複製到手機記憶體</string>
+  <string name="selected_all">全選</string>
+  <string name="deselected_all">取消全選</string>
+  <string name="selected_count">已選取 <xliff:g id="COUNT">%d</xliff:g> 個</string>
   <!-- Text to be used for affirmative response button in dialog boxes -->
+  <string name="yes">確定</string>
   <!-- Copy message to sim -->
+  <string name="operation_to_card_memory">複製訊息至 SIM 卡</string>
+  <string name="slot1">SIM 卡 1</string>
+  <string name="slot2">SIM 卡 2</string>
   <!-- Audio Library Tab for MMS attachments -->
+  <string name="mediapicker_galleryChooserDescription_cm">從這個裝置中選擇圖片或影片</string>
+  <string name="mediapicker_audioListChooserDescription">從這個裝置中選擇音訊檔案</string>
+  <string name="mediapicker_gallery_image_item_attachment_too_large">無法附加影片。訊息超出大小限制。</string>
+  <string name="mediapicker_audio_list_title">選擇音訊</string>
+  <string name="mediapicker_audio_list_item_selected_content_description">已選取音訊。</string>
+  <string name="mediapicker_audio_list_item_unselected_content_description">未選取音訊。</string>
+  <string name="mediapicker_audio_list_title_selection">已選取 <xliff:g id="count">%d</xliff:g> 個</string>
   <!-- Ride sharing -->
+  <string name="request_ride">請求乘車</string>
 </resources>